- start to implement clean_up and temp_save
- fix some naming inconsistencies