xhtml comes from GHC bindist

also small clean ups