fix a few comment blocks, minor tidy ups