Bugfixes
Improvements for Version-Managment