Some fixes on counts, need more work