More enhancements to comments section