diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..06dfd38
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+rssmon3
+exec-rssmon3
+**.sw*
diff --git a/handlers/handler.go b/handlers/handler.go
index a31ad40..39ed0e3 100644
--- a/handlers/handler.go
+++ b/handlers/handler.go
@@ -26,7 +26,7 @@ func (h *Handler) Run() error {
 		case j := <-h.Jobs:
 			go func(key string) {
 				if err := h.Job(key); err != nil {
-					log.Println(err)
+					log.Println("[h.Run]", err)
 				}
 			}(j.Key)
 		}
diff --git a/main.go b/main.go
index dd64c02..476e015 100644
--- a/main.go
+++ b/main.go
@@ -20,7 +20,7 @@ func main() {
 	if err := config.New(); err != nil {
 		panic(err)
 	}
-	log.Println(config.Values())
+	log.Println("[main]", config.Values())
 
 	m, err := monitor.New()
 	if err != nil {
@@ -50,7 +50,7 @@ func main() {
 
 func InterruptAfter(foo func() error, c chan os.Signal) {
 	if err := foo(); err != nil {
-		log.Println(err)
+		log.Println("[InterruptAfter]", err)
 	}
 	c <- syscall.SIGINT
 }
diff --git a/monitor/item.go b/monitor/item.go
index 67c35c5..a04fd0c 100644
--- a/monitor/item.go
+++ b/monitor/item.go
@@ -51,7 +51,7 @@ func (i *Item) Compare(other queue.Item) int {
 func (i *Item) Interval() time.Duration {
 	t, err := i.getInterval()
 	if err != nil {
-		log.Println(err)
+		log.Println("[Interval]", err)
 		return forever
 	}
 	return t
@@ -81,14 +81,14 @@ func (i *Item) setInterval(t time.Duration) error {
 func (i *Item) Last() time.Time {
 	t, err := i.getLast()
 	if err != nil {
-		log.Println(err)
+		log.Println("[Last]", err)
 	}
 	return t
 }
 
 func (i *Item) Mark() {
 	if err := i.setLast(time.Now()); err != nil {
-		log.Println(err)
+		log.Println("[Mark]", err)
 	}
 }
 
diff --git a/monitor/monitor.go b/monitor/monitor.go
index 57b6819..ecf715e 100644
--- a/monitor/monitor.go
+++ b/monitor/monitor.go
@@ -53,7 +53,7 @@ func (m *Monitor) triggered() <-chan time.Time {
 		return nil
 	}
 	block := time.Until(top.Last().Add(top.Interval()))
-	log.Printf("blocking %v until next task", block)
+	log.Printf("[triggered] blocking %v until next task", block)
 	return time.After(time.Until(top.Last().Add(top.Interval())))
 }
 
diff --git a/monitor/queue.go b/monitor/queue.go
index ffef815..95cf896 100644
--- a/monitor/queue.go
+++ b/monitor/queue.go
@@ -43,11 +43,11 @@ func (q *Queue) Push(i *Item) {
 	q.queue.Put(i)
 	b, err := i.Encode()
 	if err != nil {
-		log.Println(err)
+		log.Println("[Push]", err)
 		return
 	}
 	if err := config.Values().DB.Set(i.Key, b, nsQueued); err != nil {
-		log.Println(err)
+		log.Println("[Push]", err)
 		return
 	}
 }
diff --git a/rss/feed.go b/rss/feed.go
index c83c116..5063c17 100644
--- a/rss/feed.go
+++ b/rss/feed.go
@@ -74,20 +74,20 @@ func (f *Feed) Pull() error {
 	for _, i := range gofeed.Items {
 		item, err := newItem(i, f.ContentFilter)
 		if err != nil {
-			log.Println(err)
+			log.Println("[Pull]", err)
 			continue
 		}
 		itemTSs = append(itemTSs, &item.TS)
 		if item.TS.Before(f.Updated) {
-			log.Println("Skipping old item")
+			log.Println("[Pull]", "Skipping old item")
 			continue
 		}
 		if ok := regexp.MustCompile(f.TitleFilter).MatchString(item.Title); !ok {
-			log.Println("Skipping bad titled item")
+			log.Println("[Pull]", "Skipping bad titled item")
 			continue
 		}
 		if err := item.save(f.Key); err != nil {
-			log.Println(err)
+			log.Println("[Pull]", err)
 			continue
 		}
 	}
diff --git a/rss/rss.go b/rss/rss.go
index e494e5b..7a2363f 100644
--- a/rss/rss.go
+++ b/rss/rss.go
@@ -24,7 +24,7 @@ func (rss *RSS) Run() error {
 			return nil
 		case i := <-rss.items:
 			if err := rss.update(i); err != nil {
-				log.Println(err)
+				log.Println("[rss.Run]", err)
 			}
 		}
 	}
diff --git a/rssmon3.REMOVED.git-id b/rssmon3.REMOVED.git-id
deleted file mode 100644
index 9f7ae2a..0000000
--- a/rssmon3.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-49c1645f536cea7463202894e751295a3ec589f1
\ No newline at end of file
diff --git a/server/routes.go b/server/routes.go
index 478c86f..bce9f91 100644
--- a/server/routes.go
+++ b/server/routes.go
@@ -35,13 +35,13 @@ func (s *Server) notFound(w http.ResponseWriter, r *http.Request) {
 
 func (s *Server) userError(w http.ResponseWriter, r *http.Request, err error) {
 	status := http.StatusBadRequest
-	log.Printf("%d: %v", status, err)
+	log.Printf("[userError] %d: %v", status, err)
 	w.WriteHeader(status)
 }
 
 func (s *Server) error(w http.ResponseWriter, r *http.Request, err error) {
 	status := http.StatusInternalServerError
-	log.Printf("%d: %v", status, err)
+	log.Printf("[error] %d: %v", status, err)
 	w.WriteHeader(status)
 }