Clean up count operations by moving methods to the right class
Clean up failure/error detection
Merge pull request #141 from shepmaster/collection-ops

Improve collection operations