Updating windows build and fixing some bugs