Fixes from a Windows run (NOTE: this turns threading off for Windows)

The Windows threaded version was suboptimal. Thus it was removed. This
code actually turns threading off for everyone. Need to fix.