much bugfixies