Improve make.bat file