More tweaks and fiddles.