Adjust for --rerun, change settings/README