public marks

PUBLIC MARKS from asteroza with tags patch & mod