Settings & fixes

Nothing here yet.