Remove KVO from most classes, and use viewWillAppear instead. Various tweaks.