Remove the new Whitespace and use the one from modgrammar, fix small
grammar bugs.