Fix bug in helper.
Refactor notifications.
Fix bug in initialize.