Save version as a string and some minor improvements