more little bugfixes