Bugfixing the stuff