diff --git a/ModuleInstaller.cs b/ModuleInstaller.cs
index d279700bf9..9599092a43 100644
--- a/ModuleInstaller.cs
+++ b/ModuleInstaller.cs
@@ -325,12 +325,12 @@ void InstallComponent (dynamic stanza, ZipFile zipfile, Dictionary<string, Insta
             else if (stanza.install_to == "Tutorial")
             {
                 installDir = Path.Combine(Path.Combine(KSP.GameDir(), "saves"), "training");
-                makeDirs = false;
+                makeDirs = true;
             }
             else if (stanza.install_to == "GameRoot")
             {
                 installDir = KSP.GameDir();
-                makeDirs = true;
+                makeDirs = false;
             } else {
                 // What is the best exception to use here??
                 throw new Exception("Unknown install location: " + stanza.install_to);
@@ -514,4 +514,4 @@ public ModuleNotFoundException (string mod, string ver = null) {
             version = ver;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Registry.cs b/Registry.cs
index 295ad35b9a..fa2dd61dc5 100644
--- a/Registry.cs
+++ b/Registry.cs
@@ -180,8 +180,7 @@ public CkanModule LatestAvailable(string module, KSPVersion ksp_version = null)
                 return available_modules[module].Latest(ksp_version);
             }
             catch (KeyNotFoundException) {
-                return null;
-//                throw new ModuleNotFoundException(module);
+                throw new ModuleNotFoundException(module);
             }
         }
 
@@ -252,4 +251,4 @@ public bool IsInstalled(string modName) {
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/RelationshipResolver.cs b/RelationshipResolver.cs
index c993765936..905c4d116b 100644
--- a/RelationshipResolver.cs
+++ b/RelationshipResolver.cs
@@ -10,6 +10,9 @@ public struct RelationshipResolverOptions {
         public bool with_all_suggests;
     }
 
+	// Alas, it appears that structs cannot have defaults. Try
+	// DefaultOpts() to get friendly defaults.
+
     public class RelationshipResolver {
 
         // A list of all the mods we're going to install.
@@ -49,6 +52,19 @@ public RelationshipResolver (List<string> modules, RelationshipResolverOptions o
 
         }
 
+		/// <summary>
+		/// Returns the default options for relationship resolution.
+		/// </summary>
+		public static RelationshipResolverOptions DefaultOpts()
+		{
+			var opts = new RelationshipResolverOptions ();
+			opts.with_recommends = true;
+			opts.with_suggests = false;
+			opts.with_all_suggests = false;
+
+			return opts;
+		}
+
         // Resolve all relationships for a module.
         // May recurse to ResolveStanza.
         private void Resolve(CkanModule module, RelationshipResolverOptions options) {
diff --git a/Types/Version.cs b/Types/Version.cs
index 225666d385..84108c2266 100644
--- a/Types/Version.cs
+++ b/Types/Version.cs
@@ -20,9 +20,9 @@ struct Comparison {
             public string remainder1;
             public string remainder2;
         }
-        
+
         public Version (string version_string) {
-             orig_string = version_string;
+            orig_string = version_string;
 
             // TODO: Can we get rid of $1 here? Does C# support (?:syntax)?
             Match match = Regex.Match (version_string, "^(([0-9]+):)?(.*)$");