Small improvements. I need to save the run_list now