Bugfixlets & moar speed