resolved #24
misc. bug fixes
fixed windows batch file