Adding recent feature work and bugfixes

Contributions from Baker, Lothian, Powers, and Schrock