Match English version. Also corrected few typos