Additional features and some bugs

A few minor bugs fixed uncovered during testing, but not logged (by me or anyone else).

Pull requests 11 and 15. Support for invoice delivery in capture request plus some edge-case failures.