typos and a few additions.

removeComments is probably a bit too aggressive now, need to test more.