More tweaks and hacks.