XHTML & Minor Fixes