improve translation and fix some typo