Change completion comment.
Fix up help comments.
Merge branch 'develop'