Options now includes default values. Fix bug so that you can set some options to null.

Hey, this pull request seems to depend on the other one going first.