windows build mostly working again