lang issues fixed