Bugfixing the overhaul more.