Bugfixes and new version