Extend, fix, document event management (Fixes #56)