set_alarm: Misc fixes and improvements#77

N-R-K wants to merge 4 commits intojcs:masterjcs/xbanish:masterfrom

N-R-K:cleanup_setalarmN-R-K/xbanish:cleanup_setalarmCopy head branch name to clipboard