Windows improvements
Windows compiles, not yet linking