fix batch indexing and prepare for next release