Adjust the naming of the result.
Minor clean ups.
Make it work for Windows.

Note - this uses stuff that has not been commited to the Imprudence repo yet.  It still needs some tweaking before it's ready for prime time.