diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d4b860..b0684dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,6 @@ add_subdirectory(src/pq)
 add_subdirectory(src/main)
 add_subdirectory(src/common)
 add_subdirectory(src/delete)
-add_subdirectory(src/query)
 
 target_link_libraries(${PROJECT_NAME}
 	INTERFACE ${PostgreSQL_LIBRARIES}
diff --git a/README.md b/README.md
index a186243..469321d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 #	dindexer	#
 ##	Flattr	##
-[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=King_DuckZ&url=https%3A%2F%2Fbitbucket.org%2FKing_DuckZ%2Fdindexer&title=dindexer&language=c%2B%2B&tags=bitbucket&category=software)
+[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=King_DuckZ&url=https%3A%2F%2Fbitbucket.org%2FKing_DuckZ%2Fdindexer&title=dindexer&language=en_GB&tags=bitbucket&category=software)
 
 Please support the development of this software if you like it!
 
@@ -30,7 +30,7 @@ As dindexer needs to write data to a PostgreSQL database, you need to configure
 Using dindexer is pretty straightforward: mount your DVD and scan it. For example:
 
     mount /dev/cdrom /media/my_backup
-    dindexer --setname "My generic backup 2015-11-13" /media/my_backup
+    dindexer scan --setname "My generic backup 2015-11-13" /media/my_backup
 
 The program will go through every file in the path you specify. Hashing everything in that path could take a bit of time, so please be patient.
 
diff --git a/action_skel_code/main.cpp b/action_skel_code/main.cpp
index 0965e3f..39e6094 100644
--- a/action_skel_code/main.cpp
+++ b/action_skel_code/main.cpp
@@ -15,8 +15,9 @@
  * along with "dindexer".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <iostream>
 #include "commandline.hpp"
+#include <iostream>
+#include <ciso646>
 
 int main (int parArgc, char* parArgv[]) {
 	using boost::program_options::variables_map;
diff --git a/src/delete/main.cpp b/src/delete/main.cpp
index 60412d0..9f83777 100644
--- a/src/delete/main.cpp
+++ b/src/delete/main.cpp
@@ -32,6 +32,7 @@ namespace {
 		}
 		std::cout << "Confirm deleting these sets? (Y/n)" << std::endl;
 		std::string answer;
+		//see also: http://www.lb-stuff.com/user-input
 		std::cin >> std::noskipws >> answer >> std::skipws;
 
 		return (answer.empty() or "y" == answer or "Y" == answer);