Bugfixing the overhaul