better formatted translation, and a few fixes