diff --git a/src/App.cpp b/src/App.cpp
index 9af2afc..a5efb46 100644
--- a/src/App.cpp
+++ b/src/App.cpp
@@ -5,13 +5,13 @@
 
 #include "App.h"
 
+#include <iostream>
+
 #include <MessageRunner.h>
 #include <Roster.h>
 #include <StorageKit.h>
 #include <String.h>
 
-#include <iostream>
-
 #include "AtomFeed.h"
 #include "Entry.h"
 #include "Feed.h"
diff --git a/src/AtomFeed.cpp b/src/AtomFeed.cpp
index 0b389d1..c943544 100644
--- a/src/AtomFeed.cpp
+++ b/src/AtomFeed.cpp
@@ -5,10 +5,10 @@
 
 #include "AtomFeed.h"
 
-#include <tinyxml2.h>
-
 #include <iostream>
 
+#include <tinyxml2.h>
+
 #include "App.h"
 #include "Entry.h"
 #include "Util.h"
diff --git a/src/EntriesView.cpp b/src/EntriesView.cpp
index c8fdd8d..2bca8c5 100644
--- a/src/EntriesView.cpp
+++ b/src/EntriesView.cpp
@@ -5,6 +5,8 @@
 
 #include "EntriesView.h"
 
+#include <iostream>
+
 #include <Box.h>
 #include <Button.h>
 #include <Message.h>
@@ -15,8 +17,6 @@
 #include <StringView.h>
 #include <TextControl.h>
 
-#include <iostream>
-
 #include "App.h"
 #include "Util.h"
 
diff --git a/src/Entry.cpp b/src/Entry.cpp
index 398dc29..51ea1ba 100644
--- a/src/Entry.cpp
+++ b/src/Entry.cpp
@@ -5,11 +5,11 @@
 
 #include "Entry.h"
 
-#include <StorageKit.h>
-
 #include <iostream>
 #include <fstream>
 
+#include <StorageKit.h>
+
 #include "Util.h"
 
 
diff --git a/src/FeedController.cpp b/src/FeedController.cpp
index 0d89121..ebb6508 100644
--- a/src/FeedController.cpp
+++ b/src/FeedController.cpp
@@ -5,13 +5,13 @@
 
 #include "FeedController.h"
 
+#include <iostream>
+
 #include <Directory.h>
 #include <Message.h>
 #include <MessageRunner.h>
 #include <Notification.h>
 
-#include <iostream>
-
 #include "App.h"
 #include "AtomFeed.h"
 #include "Entry.h"
diff --git a/src/FeedListItem.cpp b/src/FeedListItem.cpp
index ac1e1cc..e5387f6 100644
--- a/src/FeedListItem.cpp
+++ b/src/FeedListItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020, Jaidyn Levesque <jadedctrl@teknik.io>
+ * Copyright 2021, Jaidyn Levesque <jadedctrl@teknik.io>
  * All rights reserved. Distributed under the terms of the MIT license.
  */
 
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 25082e2..6e32a36 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -5,6 +5,8 @@
 
 #include "MainWindow.h"
 
+#include <iostream>
+
 #include <Button.h>
 #include <GroupView.h>
 #include <LayoutBuilder.h>
@@ -13,8 +15,6 @@
 #include <String.h>
 #include <TabView.h>
 
-#include <iostream>
-
 #include "App.h"
 #include "EntriesView.h"
 #include "FeedController.h"
@@ -44,6 +44,10 @@ MainWindow::MessageReceived(BMessage *msg)
 		case kFeedsSelected:
 		case kFeedsEdited:
 		case kDownloadStart:
+		case kDownloadComplete:
+		case kDownloadFail:
+		case kParseComplete:
+		case kParseFail:
 		{
 			fFeedsView->MessageReceived(msg);
 			break;
@@ -122,8 +126,6 @@ MainWindow::_UpdateProgress(int32 max, int32 current)
 
 	fStatusBar->SetMaxValue(max);
 	fStatusBar->SetTo(prog);
-
-//	std::cout << prog << "/" << max << std::endl;
 }
 
 
diff --git a/src/Mimetypes.cpp b/src/Mimetypes.cpp
index 9be3aaa..766cc8f 100644
--- a/src/Mimetypes.cpp
+++ b/src/Mimetypes.cpp
@@ -1,4 +1,7 @@
 /*
+ * Copyright 2007-2016, Haiku, Inc. All rights reserved.
+ * Copyright 2001-2002 Dr. Zoidberg Enterprises. All rights reserved.
+ * Copyright 2011, Clemens Zeidler <haiku@clemens-zeidler.de>
  * Copyright 2020, Jaidyn Levesque <jadedctrl@teknik.io>
  * All rights reserved. Distributed under the terms of the MIT license.
  */
diff --git a/src/Preferences.cpp b/src/Preferences.cpp
index 2c1e4b6..4fa6b78 100644
--- a/src/Preferences.cpp
+++ b/src/Preferences.cpp
@@ -5,10 +5,10 @@
 
 #include "Preferences.h"
 
-#include <String.h>
-
 #include <iostream>
 
+#include <String.h>
+
 
 Preferences::Preferences() {
 }
diff --git a/src/ProtocolListener.cpp b/src/ProtocolListener.cpp
index e3e1fc1..380b238 100644
--- a/src/ProtocolListener.cpp
+++ b/src/ProtocolListener.cpp
@@ -5,11 +5,11 @@
 
 #include "ProtocolListener.h"
 
-#include <Url.h>
-
 #include <iostream>
 #include <sstream>
 
+#include <Url.h>
+
 
 ProtocolListener::ProtocolListener(bool traceLogging)
 		:
diff --git a/src/UpdatesView.cpp b/src/UpdatesView.cpp
index 4ea75fe..afe9934 100644
--- a/src/UpdatesView.cpp
+++ b/src/UpdatesView.cpp
@@ -12,8 +12,6 @@
 #include <LayoutBuilder.h>
 #include <Slider.h>
 
-#include <cstdio>
-
 #include "App.h"
 
 
diff --git a/src/Util.cpp b/src/Util.cpp
index bf94b63..4a737ba 100644
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -5,6 +5,9 @@
 
 #include "Util.h"
 
+#include <iostream>
+#include <iomanip>
+
 #include <Directory.h>
 #include <File.h>
 #include <OS.h>
@@ -13,8 +16,6 @@
 #include <UrlRequest.h>
 
 #include <boost/uuid/detail/sha1.hpp>
-#include <iostream>
-#include <iomanip>
 
 #include "ProtocolListener.h"