Cleaned up onEnable(), fixed update notifier