Fixing some stuff and upping the version