public marks

PUBLIC MARKS from soul1383 with tags editing & mac