Merged in markup fixes from sunday, update pub date to 20th, clean up.  

This is hopefully the final change set before publication, as I've already started working on the noLegacyStyle conversion.