Incremental Save

Saving work, improvements to clean up code on multiple problems.