Add string token for end of line.
Fix some comments.