some more work on the windows desktop client