Make settings "Singleton" + small tweaks