Fixing comment.
Misc fixes and merge