Revert "Revert "Version update and some minor changes.""

This reverts commit af76b7c422b0cae0a71b579d6155887264304014.
