Notifications Fixed, some TODOs added