General settings restructured, plus some other fixes.