Update version and some minor things