some notification improvement, adding TODO