public marks

PUBLIC MARKS from renegarde with tag rectification