Error check on untranslated elements

... plus some minor changes