diff --git a/Makefile b/Makefile
index 179c059..e4e8fa1 100644
--- a/Makefile
+++ b/Makefile
@@ -31,11 +31,9 @@ $(TARGET): $(OBJECTS)
 
 
 $(PROGRAM): CXXFLAGS += $(WX_CXXFLAGS) $(TARGET)
-$(PROGRAM): $(PROGRAM_OBJECTS) 
-	$(CXX) $(LDLIBS) $(PROGRAM_OBJECTS) -o $(PROGRAM)
+$(PROGRAM):
+	$(CXX) $(WX_CXXFLAGS) $(PROGRAM_SRC) $(LDLIBS) -o $(PROGRAM)
 	
-$(PROGRAM_OBJECTS):
-	$(CXX) $(WX_CXXFLAGS) $(PROGRAM_SRC)
 
 run:
 	./build/Tyro
diff --git a/src/network/SFTP.cpp b/src/network/SFTP.cpp
index 22bba84..2f6d9ed 100644
--- a/src/network/SFTP.cpp
+++ b/src/network/SFTP.cpp
@@ -19,7 +19,6 @@ SFTP::~SFTP() {
 string SFTP::getFile(const char *path)
 {
 	string output = "";
-	fprintf(stderr, "libssh2_sftp_open()!\n");
 	
 	LIBSSH2_SFTP_HANDLE *sftp_handle;
 	sftp_handle = libssh2_sftp_open(sftp_session, path, LIBSSH2_FXF_READ, 0);
@@ -30,8 +29,6 @@ string SFTP::getFile(const char *path)
 		return output;
 	}
 	
-	fprintf(stderr, "libssh2_sftp_open() is done, now receive data!\n");
-	
 	do {
 		char mem[1024];
 		
@@ -119,7 +116,6 @@ void SFTP::ssh_connect(const char *host, const char *user, const char *pass, con
 
 void SFTP::sftp_connect()
 {
-	fprintf(stderr, "libssh2_sftp_init()!\n");
 	sftp_session = libssh2_sftp_init(session);
 	
 	if ( ! sftp_session)
diff --git a/src/network/SFTP.h b/src/network/SFTP.h
index 824e3f4..7824cfb 100644
--- a/src/network/SFTP.h
+++ b/src/network/SFTP.h
@@ -12,14 +12,15 @@
 
 #define LIBSSH_STATIC 1
 
-// libssh2 includes
-#include <libssh2.h>
-#include <libssh2_sftp.h>
-
 // Socket includes
 #include <cstring>
 #include <sys/socket.h>
 #include <netdb.h>
+#include <stdio.h>
+
+// libssh2 includes
+#include <libssh2.h>
+#include <libssh2_sftp.h>
 
 class SFTP {
 public:
diff --git a/src/widgets/MainFrame.cpp b/src/widgets/MainFrame.cpp
index 80fe0d3..678a146 100644
--- a/src/widgets/MainFrame.cpp
+++ b/src/widgets/MainFrame.cpp
@@ -65,7 +65,7 @@ void MainFrame::SetupToolbar()
 	#include "../../resources/xpm/24/file-empty.xpm"
 	#include "../../resources/xpm/24/folder.xpm"
 	#include "../../resources/xpm/24/floppy.xpm"
-	#include "../../"
+	#include "../../resources/xpm/24/wrench-screwdriver.xpm"
 #endif
 
 	CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL);
diff --git a/src/wx_common.h b/src/wx_common.h
index fdac379..456b19f 100644
--- a/src/wx_common.h
+++ b/src/wx_common.h
@@ -1,8 +1,5 @@
-/* 
- * File:   wx_common.h
- * Author: twarren
- *
- * Created on April 7, 2015, 2:29 PM
+/**
+ * Common header for widget classes
  */
 
 #ifndef WX_COMMON_H