Cleaning up JS comments
Merging. Issues with text editor, sorry for extra commits.