A couple of updates and intelligent defaults.