Updated localisation and Fixes