fixed language switching issues - code to be cleaned