Bump version and make final changes