fix rest of batch scripts