* some bugfixes