Some more technical changes

More settings.