diff --git a/CMakeLists.txt b/CMakeLists.txt
index c33b3b6e..c9aedce8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,7 @@ SET(root_dir ${CMAKE_SOURCE_DIR})
 SET(cmake_dir ${root_dir}/cmake)
 SET(bin_dir ${root_dir}/bin)
 SET(doc_dir ${root_dir}/doc)
+SET(doc_dir ${root_dir}/doc)
 
 # Now for the stuff to generate config.h (and setup defines).
 INCLUDE(${cmake_dir}/CMakeLists_config.txt)
diff --git a/build/commands.py b/build/commands.py
index d157d3a1..029f262e 100644
--- a/build/commands.py
+++ b/build/commands.py
@@ -64,34 +64,34 @@ class InternalCommands:
 		'4' : 'Visual Studio 9 2008 Win64',
 		'5' : 'Visual Studio 8 2005',
 		'6' : 'Visual Studio 8 2005 Win64',
-		'10' : 'CodeBlocks - MinGW Makefiles',
-		'11' : 'CodeBlocks - Unix Makefiles',
-		'12': 'Eclipse CDT4 - MinGW Makefiles',
-		'13': 'Eclipse CDT4 - NMake Makefiles',
-		'14': 'Eclipse CDT4 - Unix Makefiles',
-		'15': 'MinGW Makefiles',
-		'16': 'NMake Makefiles',
-		'17': 'Unix Makefiles',
-		'18': 'Borland Makefiles',
-		'19': 'MSYS Makefiles',
-		'20': 'Watcom WMake',
+#		'10' : 'CodeBlocks - MinGW Makefiles',
+#		'11' : 'CodeBlocks - Unix Makefiles',
+#		'12': 'Eclipse CDT4 - MinGW Makefiles',
+#		'13': 'Eclipse CDT4 - NMake Makefiles',
+#		'14': 'Eclipse CDT4 - Unix Makefiles',
+#		'15': 'MinGW Makefiles',
+#		'16': 'NMake Makefiles',
+#		'17': 'Unix Makefiles',
+#		'18': 'Borland Makefiles',
+#		'19': 'MSYS Makefiles',
+#		'20': 'Watcom WMake',
 	}
 
 	unix_generators = {
 		'1' : 'Unix Makefiles',
-		'2' : 'CodeBlocks - Unix Makefiles',
-		'3' : 'Eclipse CDT4 - Unix Makefiles',
-		'4' : 'KDevelop3',
-		'5' : 'KDevelop3 - Unix Makefiles',
+#		'2' : 'CodeBlocks - Unix Makefiles',
+#		'3' : 'Eclipse CDT4 - Unix Makefiles',
+#		'4' : 'KDevelop3',
+#		'5' : 'KDevelop3 - Unix Makefiles',
 	}
 
 	darwin_generators = {
 		'1' : 'Xcode',
 		'2' : 'Unix Makefiles',
-		'3' : 'CodeBlocks - Unix Makefiles',
-		'4' : 'Eclipse CDT4 - Unix Makefiles',
-		'5' : 'KDevelop3',
-		'6' : 'KDevelop3 - Unix Makefiles',
+#		'3' : 'CodeBlocks - Unix Makefiles',
+#		'4' : 'Eclipse CDT4 - Unix Makefiles',
+#		'5' : 'KDevelop3',
+#		'6' : 'KDevelop3 - Unix Makefiles',
 	}
 
 	def getBinDir(self, target=''):
@@ -125,7 +125,7 @@ class InternalCommands:
 			'  revision    Display the current source code revision\n'
 			'  package     Create a distribution package (e.g. tar.gz)\n'
 			'  install     Installs the program\n'
-			'  doxygen	 Builds doxygen documentation\n'
+			'  doxygen     Builds doxygen documentation\n'
 			'  reformat    Reformat .cpp and .h files using AStyle\n'
 			'  usage       Shows the help screen\n'
 			'\n'
@@ -159,8 +159,9 @@ class InternalCommands:
 		if generator != '':
 			cmake_args += ' -G "' + generator + '"'
 		
-		# always specify a build type (debug, release, etc)
-		cmake_args = ' -DCMAKE_BUILD_TYPE=' + target.capitalize()
+		# for non-vs always specify a build type (debug, release, etc)
+		if not generator.startswith('Visual Studio'):
+			cmake_args = ' -DCMAKE_BUILD_TYPE=' + target.capitalize()
 		
 		# if not visual studio, use parent dir
 		sourceDir = self.source_dir
@@ -869,7 +870,7 @@ class CommandHandler:
 	
 	def configure(self):
 		target = ''
-		if (len(build_targets) > 0):
+		if (len(self.build_targets) > 0):
 			target = self.build_targets[0]
 		self.ic.configure(target)
 	
diff --git a/hm.py b/hm.py
index 4ea4f683..4ecfd040 100644
--- a/hm.py
+++ b/hm.py
@@ -44,31 +44,31 @@ build_options_long = ['debug', 'release']
 # list of valid commands as keys. the values are optarg strings, but most 
 # are None for now (this is mainly for extensibility)
 cmd_opt_dict = {
-	'about' 	: ['', []],
-	'setup' 	: ['', []],
+	'about'     : ['', []],
+	'setup'     : ['', []],
 	'configure' : ['', []],
-	'build' 	: [build_options, build_options_long],
-	'clean' 	: [build_options, build_options_long],
-	'update' 	: ['', []],
-	'install' 	: ['', []],
+	'build'     : [build_options, build_options_long],
+	'clean'     : [build_options, build_options_long],
+	'update'    : ['', []],
+	'install'   : ['', []],
 	'doxygen'   : ['', []],
-	'dist'		: ['', []],
-	'distftp'       : ['', ['host=', 'user=', 'pass=', 'dir=']],
-	'kill' 		: ['', []],
-	'usage' 	: ['', []],
-	'revision' 	: ['', []],
-	'reformat' 	: ['', []],
-	'open'		: ['', []],
+	'dist'      : ['', []],
+	'distftp'   : ['', ['host=', 'user=', 'pass=', 'dir=']],
+	'kill'      : ['', []],
+	'usage'     : ['', []],
+	'revision'  : ['', []],
+	'reformat'  : ['', []],
+	'open'      : ['', []],
 }
 
 # aliases to valid commands
 cmd_alias_dict = {
-	'info'		: 'about',
-	'help'		: 'usage',
-	'package'	: 'dist',
-	'docs'		: 'doxygen',
-	'make'		: 'build',
-	'cmake'		: 'configure',
+	'info'	    : 'about',
+	'help'      : 'usage',
+	'package'   : 'dist',
+	'docs'      : 'doxygen',
+	'make'      : 'build',
+	'cmake'     : 'configure',
 }
 
 def complete_command(arg):