Add language file + a small improvement