Many fixes
Versioning