[BUGFIX] some bugfixes