better comenting and DOM preserve whitespaces