Bugfixes and more