updates to support batch tracking
few minor updates
making count options dynamic