Several cosmetic fixes
Versioning