More tweaks. Whew!