Org: properly handle plugins.
Org: add notes when WAITING or CANCELLED.
Org: misc changes.