Fix incorrect options objects and incorrect fn calls.  Fixes #6.