Small cleanups, fixes. Save method WIP