typo in a message and some comments