various fixes
batch script renamed
further simplification for setup.py and setup_mac.py