More addBatch changes
Incorporate more mass-upload optimizations