Added comment count meta, updated todo