More fixes and tweaks, cleanup time