moar bugfixing