Further tweaks and corrections to default settings