More tweaks and polishing