Bugfixes and New Features