verion and location tweaks