fixed alarm and some spacing