okay, that fixes one part.
TODO: Config saving verification
TODO: Fix NPE when enabled.