Fix bug with delegates
Also fix event names when adding/removing listeners