Comment enhancements