windows fixes and some more