Improve notification ordering

Fixes #2, #3