more fix
separate handler of single/multiline head comments
Improvements on WSJ