diff --git a/config.json b/config.json
index 75813f9..388033d 100644
--- a/config.json
+++ b/config.json
@@ -2,10 +2,10 @@
 	"AdminUsername": "",
 	"AdminPassword": "",
 	"MediaDirectory": "podcasts/",
-	"Name": "Git Galaxy Stargazers",
+	"Name": "Git Galaxy Podcast",
 	"Host": "Gabriel Simmer",
 	"Email": "gabriel@gitgalaxy.com",
-	"Description": "open source discussion",
+	"Description": "Discussion about open source projects on the internet.",
 	"Image": "localhost:8000/assets/podcast_image.png",
 	"PodcastUrl": "http://localhost:8000"
 }
\ No newline at end of file
diff --git a/src/admin.go b/src/admin.go
index c26f721..1e25006 100644
--- a/src/admin.go
+++ b/src/admin.go
@@ -2,7 +2,7 @@
  * 
  * Here is where all the neccesary functions for managing episodes
  * live, e.g adding removing etc.
-*/
+ */
 
 package main
 
@@ -13,8 +13,9 @@ import (
 	"io/ioutil"
 	"io"
 	"os" // ioOS?
-)
 
+	"github.com/spf13/viper"
+)
 // Write custom CSS to disk or send it back to the client if GET
 func CustomCss(w http.ResponseWriter, r *http.Request) {
 	if r.Method == "POST" {
diff --git a/src/generate_rss.go b/src/generate_rss.go
index d24a053..a0c5917 100644
--- a/src/generate_rss.go
+++ b/src/generate_rss.go
@@ -3,7 +3,7 @@
  * This file contains functions for monitoring for file changes and 
  * regenerating the RSS feed accordingly, pulling in shownote files
  * and configuration parameters
-*/ 
+ */ 
 
 package main
 
@@ -21,6 +21,12 @@ import (
 
 // Watch folder for changes, called from webserver.go
 func watch() {
+	viper.SetConfigName("config")
+	viper.AddConfigPath(".")
+	err := viper.ReadInConfig() // Find and read the config file
+	if err != nil { // Handle errors reading the config file
+		panic(fmt.Errorf("Fatal error config file: %s \n", err))
+	}
 	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
 		log.Fatal(err)
diff --git a/src/webserver.go b/src/webserver.go
index 1cdd4ee..f6ae7bf 100644
--- a/src/webserver.go
+++ b/src/webserver.go
@@ -2,7 +2,7 @@
  * 
  * This is the webserver handler for Pogo, and handles
  * all incoming connections, including authentication. 
-*/
+ */
 
 package main
 
@@ -59,7 +59,7 @@ func HomeHandler(w http.ResponseWriter, r *http.Request) {
 /*
  * Code from stackoverflow by user Timmmm
  * https://stackoverflow.com/questions/21936332/idiomatic-way-of-requiring-http-basic-auth-in-go/39591234#39591234
-*/
+ */
 func BasicAuth(handler http.HandlerFunc,) http.HandlerFunc {
 
     return func(w http.ResponseWriter, r *http.Request) {
@@ -74,7 +74,6 @@ func BasicAuth(handler http.HandlerFunc,) http.HandlerFunc {
             w.Write([]byte("Unauthorised.\n"))
             return
         }
-
         handler(w, r)
     }
 }