diff --git a/src/pagefinish.cpp b/src/pagefinish.cpp
index 1b209e8..90b8276 100644
--- a/src/pagefinish.cpp
+++ b/src/pagefinish.cpp
@@ -1,6 +1,7 @@
 #include "pagefinish.h"
 
 #include <QApplication>
+#include <QDebug>
 
 #include <QLabel>
 #include <QBoxLayout>
diff --git a/src/pagemanager.cpp b/src/pagemanager.cpp
index b80774a..eaa59b0 100644
--- a/src/pagemanager.cpp
+++ b/src/pagemanager.cpp
@@ -63,18 +63,18 @@ void PageManager::showFirst()
 
 void PageManager::showNext()
 {
-	if ( !m_isSinglePage && (m_CurPage != m_Pages.end()) && ((m_CurPage + 1) != m_Pages.end()) )
+	if ((*m_CurPage)->validate())
 	{
-		if ((*m_CurPage)->validate())
+		if ( !m_isSinglePage && (m_CurPage != m_Pages.end()) && ((m_CurPage + 1) != m_Pages.end()) )
 		{
 			++m_CurPage;
 			pageUpdate();
 		}
-	}
-	if (m_isSinglePage)
-	{
-		m_isSinglePage = false;
-		pageUpdate();
+		if (m_isSinglePage)
+		{
+			m_isSinglePage = false;
+			pageUpdate();
+		}
 	}
 }
 
@@ -82,11 +82,8 @@ void PageManager::showPrevious()
 {
 	if ( !m_isSinglePage && (m_CurPage != m_Pages.begin()) )
 	{
-		if ((*m_CurPage)->validate())
-		{
-			--m_CurPage;
-			pageUpdate();
-		}
+		--m_CurPage;
+		pageUpdate();
 	}
 	if (m_isSinglePage)
 	{
@@ -95,7 +92,6 @@ void PageManager::showPrevious()
 	}
 }
 
-// TODO
 void PageManager::pageUpdate()
 {
 	QString	label;
diff --git a/src/systeminstaller.cpp b/src/systeminstaller.cpp
index c730530..0f7b9de 100644
--- a/src/systeminstaller.cpp
+++ b/src/systeminstaller.cpp
@@ -159,18 +159,19 @@ void SystemInstaller::completePartitioning()
 
 void SystemInstaller::volumeSelect(QString volume)
 {
-	qDebug() << "Selected volume is " << volume;
+	//qDebug() << "Selected volume is " << volume;
 	m_InstallSettings.disk = volume;
 }
 
 void SystemInstaller::configurationSelect(InstallerSettings settings)
 {
+	/*
 	qDebug() << "Selected settings: ";
 	qDebug() << "Host: " << settings.host;
 	qDebug() << "FS: " << settings.fs;
 	qDebug() << "Language: " << settings.language;
 	qDebug() << "Timezone: " << settings.timezone;
-
+	*/
 	// replace selected volume
 	settings.disk = m_InstallSettings.disk;
 	m_InstallSettings = settings;