Update docs for changed defaults
Add generic way to specify options