public marks

PUBLIC MARKS from jasonbentley with tags win32 & tweaks