Corrected total mutation counts, and also safer handling of temp files