first batch of XHTML validation fixes
second batch of xhtml validation fixes