No new features; cleanup and fixes.

Got what’s there to build and refactored some of the code.