comment box updates
Merge branch 'comment-box-fixes'