Notification Engine + Minor Improvements