bugfixes and new features