Fixed a bug with 10 minutes to x
Fixed a bug in five minutes to
added 24hr handling for hour