some little bugfixes