Bug fixes and snapshot before realigning results

This is before I rewrite the results scripts to allow the effect of
different method options to be directly compared.