Beta 0.1 - without time alarms - minor changes