Code cleanupz and localisation bug!