rework some cw alarm mappings