last lang changes and bug fixes