Incident API improvements

Fixes for #105 and #106 and #107.