updated todo, fixed saving and removed a few buttons