revamped notifier a bit, optional params and such