2.2.0.2 stability

Leaving this up until ready for review. This is every remaining change necessary to get SWMH stable for 2.2.0.2.