Fix options

This won't crash if you don't pass in options now. Also commented a
couple things.