More Notification And QS improvements