Zeroing in

More tweaks