some bugfixes etc ...