add translation and fix bugs