More work on comments
Updating comments branch with master

Merge w/ master
Small tweaks