fixed multiple alarm issues