Windows build fixes
Final API changes, added a few more options
Continue last commit