just a few little bugfixes
again just a few little bugfixes...