a few typo, and some more