Build, plus more changes to formatting and comments
Merge origin/master