Fixed save results not saving, and clean up