Put back english translation, a few other fixes