Removed some bugs with alarm sound