localisation done // some small fixes