diff --git a/main.go b/main.go
index 69313e1..d6aa312 100644
--- a/main.go
+++ b/main.go
@@ -165,7 +165,7 @@ func printTime(pRemains *time.Duration, target time.Duration, delim *rune, rever
 		final = rem
 	} else {
 		rem := fmt.Sprintf("%2d%c%02d%c%02d ", hrs, byte(*delim), min, byte(*delim), seconds)
-		final = fmt.Sprintf("%s ", rem)
+		final = rem + " "
 		if eta {
 			final = fmt.Sprintf("%s  \tETA: %s", final, time.Unix(0, time.Now().UnixNano()+pRemains.Nanoseconds()).Format("3:04"))
 		}
@@ -173,7 +173,7 @@ func printTime(pRemains *time.Duration, target time.Duration, delim *rune, rever
 			go alertTime(pRemains, target, reverse, repeat)
 		}
 	}
-	logger.Log("\r%s", final)
+	logger.Logf("\r%s", final)
 }
 
 func alertTime(pRemains *time.Duration, target time.Duration, reverse, repeat bool) {
@@ -186,9 +186,14 @@ func alertTime(pRemains *time.Duration, target time.Duration, reverse, repeat bo
 		if repeat {
 			originalStart = time.Now()
 			if reverse {
-				*pRemains -= target
-			} else {
+				for *pRemains > 0 {
+					*pRemains -= target
+				}
 				*pRemains += target
+			} else {
+				for *pRemains < 0 {
+					*pRemains += target
+				}
 			}
 			notified = false
 		}