More tweaks and tightening up