Update several typo and make it better