threading fix, alarm removal fix