more Windows config and packaging cleanup and fixing (work in progress)