Reorganization of defaults and addition of startup_local