convert to xhtml5 and other minor tweaks