Reviewed that notification system

I reviewed the notification in some more detail than I'd done before and fixed a few small things - including some python which seemed to have found its way into our code base. :wink: