update Windows build and merge Bill's latest modifications