Added a cancel-action option, and set a few things to have defaults so
they aren't required.