Edit match results and some reorganization of translations