More notifications fun

Mostly fixing my own bugs where what's in my head didn't square with what was in the code so I thought I'd already done some prep I actually hadn't.