Comment Management Enhancements

Luis, let me know if you come across any issues--thanks!