Some cleanup, upped version number