Update for batch and a few other changes