More tweaks and crap.