Cleaned up code; fixed dev_setup.bat for folks