some bugfixes and new features