Jordy commit

alarm b fix
alarm display code korter