Define eventing
Fix some TODOs.