fixing up notifications