+ some bugfix