fix spelling error
Enabled sorting of comments
Merge changes