fill-paragraph all the comments
fix unqualified token constructors
added a few "tests"