More work mainly on scheduling alarms