#35 XHTML validation fixes