Small cosmetic changes. Fixed alarm bugs. Needs more comemnting.