new translation and a little bit fix