Some better translations and some fixs