fixed some notification bugs