public marks

PUBLIC MARKS from tim37now with tags t & fix