bugfixing orgy