Some improvements on translator