Alarm button added and smaller bug fixed, work in progress...