edits
edits, apply swaps
add swaps, change to WinRM
edits per PR 346