Several cosmetic fixes found in testing
Versioning