Fixed a couple of bugs and upped version number