bugfixes and new feature