bugfixing and localisation