small bugfixes ahoy