tracker_scraper.go | 5 +++++

diff --git a/tracker_scraper.go b/tracker_scraper.go
index 23c3ebf6f8c7025e884432dfc94233cb5f199b6c..cf8f99fe86999fbfc71028023444b2e5b6c8b102 100644
--- a/tracker_scraper.go
+++ b/tracker_scraper.go
@@ -28,6 +28,8 @@ 		ts.url,
 		func() string {
 			// return ts.lastAnnounce.Completed.Add(ts.lastAnnounce.Interval).Format("2006-01-02 15:04:05 -0700 MST")
 			na := ts.lastAnnounce.Completed.Add(ts.lastAnnounce.Interval).Sub(time.Now())
+			na /= time.Second
+			na *= time.Second
 			if na > 0 {
 				return na.String()
 			} else {
@@ -37,6 +39,9 @@ 		}(),
 		func() string {
 			if ts.lastAnnounce.Err != nil {
 				return ts.lastAnnounce.Err.Error()
+			}
+			if ts.lastAnnounce.Completed.IsZero() {
+				return "never"
 			}
 			return fmt.Sprintf("%d peers", ts.lastAnnounce.NumPeers)
 		}())