Continued work-in-progress.  Added comments. Fixed a static.  Etc.
Merged in @sc0ttkclark's formatting changes and some commenting a bug fixes.
committing merge changes