Tweaking

Mostly presentational changes & testing.

The working folder stuff puzzled me. Is it not easier to do everything in the one folder?