More notification updates and additions