Feature/small bugfixes