commit before branch. Versioning changed and some minor cleanups/changes.