More work on the update path
Fixing the upgrade path.
Minor fix.
Increase number of batches.