fix comments, some typos...