prepare for localisation, minor fixes