Fixed most of the translation issues