tweaks and little bugfixes