FINAL (for real) beta commit; fixes notification clearing issue