Added alarm editing & other fixes