Minor improvements, also update to newer subscription/notification format