Changed version number and minor cleanup