lots of things, including comment styling
updates
small additions
some comments progress, although strewn with errors
fixed merge