More tweaks; a few to go yet.