fix parsing scripts, move batches