Add translation and fix minor bug