Fixed elliott's errors and add correct localisations