cleaning up, adding save-program