minor tweaks everywhere
Final fixups