fixed some windows stuff
committing merged changes