Complete translation and minor fixes