FIX translations and minor fixes