Cmake windows/msvc minor cleanup
wip