things now compile on Windows, but don't run correctly yet
merged updates from github