Bugfixes and additional features