Comment & count tweaks