Updated some more code so that options can be set on toggles and that features can be persisted a little easier