adding some settings and reversing accidental swap file inclusions