Batch format fix
Finished adminworld, still needs testing.
Merge branch 'master' into mg_incomplete