translation and other fixes