+small bugfixes