bugfixes and versioning