moar small bugfixes