Bug fixes

Signed-off-by: Suki <suki@missallsunday.com>
Allow notifications to use closures if they really want it to

Signed-off-by: Suki <suki@missallsunday.com>