done some tinkering with the win32 settings
merged changes