edits, moving default values, cleaning up swap_ files.