Fixed a numbe of small bugs with translation.