Some alarm fixes + 1 new alarm method for resetting alarm