General fixes, added run.bat

Added run.bat
Constants adjusted to suit eg logs