public marks

PUBLIC MARKS from kgriffen with tags compliance & hacking