Closes #46 improve batch operations and resolves #47 overcounting issue.