merged okfde code and added 3 lines of translation fixes