some more work done on Windows