ADD alarm; serveral bugs fixed