Dev Some variable refactoring
Dev Corrected translations