Pull settings improvements by @pwhipp

Pulling as is to tweak later.