better naming and workflow, improved save function