Updated from Chao... again

Also fixed batch file