Minor updates for batch file