Fixed notifications, added local alert