Some Bug fix and Translator fix
requested review from @brandsta
assigned to @hosseinz
mentioned in commit f02b07bb
merged