Bugfixes and added features