diff --git a/README.md b/README.md
index 4d25ca6..12e4c93 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ $ tree -d
 │   ├── resources       # GResources folder
 │   │   └── gtk         # Contains the glade.ui files.
 │   └── src
-│       ├── views       # Currently only contains the Podcasts_view.
+│       ├── views       # Currently only contains the Empty and Episodes views.
 │       └── widgets     # Contains custom widgets such as Podcast and Episode.
 ```
 
diff --git a/hammond-data/src/models/queryables.rs b/hammond-data/src/models/queryables.rs
index b83ba52..99672bc 100644
--- a/hammond-data/src/models/queryables.rs
+++ b/hammond-data/src/models/queryables.rs
@@ -612,7 +612,6 @@ impl<'a> Source {
         let etag = headers.get::<ETag>();
         let lmod = headers.get::<LastModified>();
 
-        // FIXME: This dsnt work most of the time apparently
         if self.http_etag() != etag.map(|x| x.tag()) || self.last_modified != lmod.map(|x| {
             format!("{}", x)
         }) {
@@ -659,9 +658,6 @@ impl<'a> Source {
             }
         }
 
-        // FIXME: I have fucked up somewhere here.
-        // Getting back 200 codes even though I supposedly sent etags.
-        // info!("Headers: {:?}", headers);
         let client = reqwest::Client::builder().referer(false).build()?;
         let mut req = client.get(self.uri()).headers(headers).send()?;
 
diff --git a/hammond-data/src/parser.rs b/hammond-data/src/parser.rs
index ecb610c..c5e4f4d 100644
--- a/hammond-data/src/parser.rs
+++ b/hammond-data/src/parser.rs
@@ -8,7 +8,6 @@ use utils::replace_extra_spaces;
 
 use errors::*;
 
-// TODO: Extend the support for parsing itunes extensions
 /// Parses a `rss::Channel` into a `NewPodcast` Struct.
 pub(crate) fn new_podcast(chan: &Channel, source_id: i32) -> NewPodcast {
     let title = chan.title().trim();
diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs
index cd953f5..99415d9 100644
--- a/hammond-gtk/src/app.rs
+++ b/hammond-gtk/src/app.rs
@@ -64,6 +64,7 @@ impl App {
     }
 
     pub fn setup_actions(&self) {
+        // Updates the database and refreshes every view.
         let update = gio::SimpleAction::new("update", None);
         let content = self.content.clone();
         let header = self.header.clone();
@@ -72,6 +73,7 @@ impl App {
         });
         self.app_instance.add_action(&update);
 
+        // Refreshes the `Content`
         let refresh = gio::SimpleAction::new("refresh", None);
         let content = self.content.clone();
         refresh.connect_activate(move |_, _| {
@@ -79,6 +81,7 @@ impl App {
         });
         self.app_instance.add_action(&refresh);
 
+        // Refreshes the `EpisodesStack`
         let refresh_episodes = gio::SimpleAction::new("refresh_episodes", None);
         let content = self.content.clone();
         refresh_episodes.connect_activate(move |_, _| {
@@ -88,6 +91,7 @@ impl App {
         });
         self.app_instance.add_action(&refresh_episodes);
 
+        // Refreshes the `ShowStack`
         let refresh_shows = gio::SimpleAction::new("refresh_shows", None);
         let content = self.content.clone();
         refresh_shows.connect_activate(move |_, _| {
@@ -143,7 +147,6 @@ impl App {
 
 fn build_ui(window: &gtk::Window, app: &gtk::Application) {
     window.set_application(app);
-
     window.show_all();
     window.activate();
     app.connect_activate(move |_| ());
diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs
index 983cb5c..8f4c38e 100644
--- a/hammond-gtk/src/headerbar.rs
+++ b/hammond-gtk/src/headerbar.rs
@@ -73,9 +73,6 @@ impl Header {
         let header = Rc::new(self.clone());
         add_button.connect_clicked(clone!(content, header, add_popover, new_url => move |_| {
             on_add_bttn_clicked(content.clone(), header.clone(), &new_url);
-
-            // TODO: lock the button instead of hiding and add notification of feed added.
-            // TODO: map the spinner
             add_popover.hide();
         }));
 
diff --git a/hammond-gtk/src/views/episodes.rs b/hammond-gtk/src/views/episodes.rs
index 2312d15..7a4d794 100644
--- a/hammond-gtk/src/views/episodes.rs
+++ b/hammond-gtk/src/views/episodes.rs
@@ -193,7 +193,6 @@ impl EpisodesViewWidget {
         let container: gtk::Box = builder.get_object("container").unwrap();
         let image: gtk::Image = builder.get_object("cover").unwrap();
 
-        // FIXME:
         if let Ok(pd) = dbqueries::get_podcast_cover_from_id(episode.podcast_id()) {
             let img = get_pixbuf_from_path(&pd, 64);
             if let Some(i) = img {
diff --git a/hammond-gtk/src/views/shows.rs b/hammond-gtk/src/views/shows.rs
index acd1022..46b2865 100644
--- a/hammond-gtk/src/views/shows.rs
+++ b/hammond-gtk/src/views/shows.rs
@@ -44,7 +44,6 @@ impl ShowsPopulated {
         use gtk::WidgetExt;
 
         // TODO: handle unwraps.
-        // TODO: implement back button.
         self.flowbox
             .connect_child_activated(clone!(show => move |_, child| {
             // This is such an ugly hack...