updated for next release, mostly windows fixes