fixed some mixed language issues