Adding _count to the diagnostics output

Closes #22