public marks

PUBLIC MARKS from decembre with tags tweak & tester