Fixed a few bugs and updated the version number