More comment system updates