Fixed some versioning, and formatting