Allow more settings to be overridden.

Switch to some saner defaults.