Minor tweaks, add comment counts