Improve Alarm

Minutes are now optional in:

	set the alarm for two hours (and three minutes)
Convert optStr -> strOpt in most places