simplify notification aggregation
limit number of notifications to be aggregated
add TODO comments