fixed bug with comments, fixed issue with hyphenation, closes #5