public marks

PUBLIC MARKS from znarf with tags flash & paris