minor fixes, plus a new translator
resolved merge conflict