api fix and notifier update