windows fixes
refactors