Made a few small formatting changes and corrected a comment typo.  Prepping to merge the branch back into master.