Bugfixes and better version number handling