more finalized updates for fixes to Windows-based systems