- fixed some bugs in the new comment/discussion code and added a few
  enhancements