fixes
Angie saving and cleanup