Fix XHTML validation bugs; minor text improvements