+ some bugfixes