diff --git a/backend/main.go b/backend/main.go
index 7bf9808..564e8d2 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -23,6 +23,7 @@ var conf = config.New()
 
 func main() {
 	log.SetFlags(0)
+	log.Print("Running backend")
 
 	conn, err := amqp.Dial(conf.RabbitURL)
 	if err != nil {
@@ -85,6 +86,8 @@ func main() {
 		log.Fatalf("Failed to register a consumer: %s", err)
 	}
 
+	// Reads messages from the back end queue
+	// and prints them to the terminal
 	go func() {
 		for msg := range msgs {
 			var message Message
@@ -101,9 +104,9 @@ func main() {
 	publishInput(conn)
 }
 
-// publishInput reads user input from stdin,
-// marshals as json messages, and publishes them
-// to a RabbitMQ exchange
+// publishInput reads user input, marshals to json,
+// and publishes to RabbitMQ with the front end
+// and database keys
 func publishInput(c *amqp.Connection) {
 	ch, err := c.Channel()
 	if err != nil {
diff --git a/database/main.go b/database/main.go
index 05c147a..8ec3279 100644
--- a/database/main.go
+++ b/database/main.go
@@ -20,6 +20,9 @@ type Message struct {
 var conf = config.New()
 
 func main() {
+	log.SetFlags(0)
+	log.Print("Running database")
+
 	// Postgres connection
 	connP, err := pgx.Connect(context.Background(), conf.PostgresURL)
 	if err != nil {
@@ -97,7 +100,7 @@ func main() {
 			break
 		}
 
-		// Insert a message from Rabbit to Postgres
+		// Insert a message from RabbitMQ to Postgres
 		_, err = connP.Exec(context.Background(), "insert into messages (message, created) values ($1, to_timestamp($2))", message.Text, message.Time/1000)
 		if err != nil {
 			log.Printf("Failed to insert into a database: %s", err)
diff --git a/server/main.go b/server/main.go
index 1110adf..5587ec0 100644
--- a/server/main.go
+++ b/server/main.go
@@ -26,6 +26,7 @@ var (
 
 func main() {
 	log.SetFlags(0)
+	log.Print("Running server")
 
 	conn, err := amqp.Dial(conf.RabbitURL)
 	if err != nil {
@@ -75,21 +76,15 @@ func main() {
 		log.Fatalf("Failed to bind a backend queue: %s", err)
 	}
 
-	// files := http.FileServer(http.Dir("./static"))
-	// http.Handle("/static/", http.StripPrefix("/static/", files))
-	// http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.FS(static))))
 	http.Handle("/static/", http.FileServer(http.FS(static)))
-
 	http.HandleFunc("/", handleHome)
 	http.HandleFunc("/ws", func(w http.ResponseWriter, r *http.Request) {
 		handleWs(w, r, conn)
 	})
-
 	log.Fatal(http.ListenAndServe(conf.ServerAddr, nil))
 }
 
 func handleHome(w http.ResponseWriter, r *http.Request) {
-	// t, _ := template.ParseFiles("template.html")
 	t, _ := template.ParseFS(files, "template.html")
 	t.Execute(w, nil)
 }
@@ -110,8 +105,8 @@ func handleWs(w http.ResponseWriter, r *http.Request, c *amqp.Connection) {
 	<-done
 }
 
-// wsWriter reads messages from a Rabbit exchange
-// and writes to a websocket
+// wsWriter reads messages from RabbitMQ
+// and writes to websocket
 func wsWriter(ws *websocket.Conn, c *amqp.Connection, done chan bool) {
 	defer func() {
 		done <- true
@@ -152,7 +147,7 @@ func wsWriter(ws *websocket.Conn, c *amqp.Connection, done chan bool) {
 	msgs, err := ch.Consume(
 		q.Name, // queue name
 		"",     // consumer
-		false,  // auto-ack
+		true,   // auto-ack
 		false,  // exclusive
 		false,  // no-local
 		false,  // no-wait
@@ -170,14 +165,12 @@ func wsWriter(ws *websocket.Conn, c *amqp.Connection, done chan bool) {
 			log.Printf("Failed to write to WebSocket: %s", err)
 			break
 		}
-
-		msg.Ack(false)
 	}
 
 }
 
-// wsReader reads messages from a websocket and writes
-// to a Rabbit exchange
+// wsReader reads messages from websocket
+// and publishes to RabbitMQ
 func wsReader(ws *websocket.Conn, c *amqp.Connection, done chan bool) {
 	defer func() {
 		done <- true