Notifications, bug fixes, cleaner PDS code