lots of updates and little fixes for versioning on the latest codebase