more tweaking of settings
fixed moar conflicts