Lots of new comments
A few bug fixes