Fixes and tweaks. Ugh, those parts are hard...