Another patch (sorry), includes tidy up and result directory feature that actually works!