fixed a number of windows issues