Better error messages on unknown word. Fix multi-line comment.