Some bugfixes and alarm edit functionality a bit cumbersome for now :)