minor fixes and additions to windows setup and cinst order
minor fixes and additions to windows setup and cinst order

virgo47/litterbin,virgo47/litterbin,virgo47/litterbin,virgo47/litterbin,virgo47/litterbin,virgo47/litterbin,virgo47/litterbin