Minor setup fixes for executing the bat from another batch file
The last minor change to use it also standalone.
Correct setup.bat