add windows and fix linux