+ small bugfixes