diff --git a/src/Manos/Manos.csproj b/src/Manos/Manos.csproj
index 21fda8df..0a8dd648 100644
--- a/src/Manos/Manos.csproj
+++ b/src/Manos/Manos.csproj
@@ -38,9 +38,15 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="Mono.Posix" />
-    <Reference Include="Mono.CSharp" />
-    <Reference Include="Mono.C5" />
+    <Reference Include="Mono.Posix">
+      <HintPath>..\..\libs\Mono.Posix.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.CSharp">
+      <HintPath>..\..\libs\Mono.CSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.C5">
+      <HintPath>..\..\libs\Mono.C5.dll</HintPath>
+    </Reference>
     <Reference Include="Nini, Version=1.1.0.0, Culture=neutral, PublicKeyToken=c9892194e1b9ec1b">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\libs\Nini.dll</HintPath>
diff --git a/src/manostool/Driver.cs b/src/manostool/Driver.cs
index 383e827f..053dced3 100644
--- a/src/manostool/Driver.cs
+++ b/src/manostool/Driver.cs
@@ -39,6 +39,7 @@ class Driver
 		public static readonly string COMPILED_TEMPLATES_ASSEMBLY = "CompiledTemplates.dll";
 		public static readonly string TEMPLATES_DIRECTORY = "Templates";
 		public static readonly string DEPLOYMENT_DIRECTORY = "Deployment";
+		public static readonly string MANOS_TOOLNAME = "manostool";
 		
 		private static Environment Environment = new Environment ();
 
@@ -65,7 +66,7 @@ public static int Main (string[] args)
 			try {
 				extra = p.Parse(args);
 			} catch (OptionException){
-				Console.WriteLine ("Try `manos --help' for more information.");
+				Console.WriteLine (string.Format ("Try `{0} --help' for more information.", MANOS_TOOLNAME));
 				return 1;
 			}
 			
@@ -115,7 +116,7 @@ private static string [] ParseGlobalOptions (string [] args)
 			try {
 				extra = p.Parse(args);
 			} catch (OptionException){
-				Console.WriteLine ("Try `manos --help' for more information.");
+				Console.WriteLine (string.Format ("Try `{0} --help' for more information.", MANOS_TOOLNAME));
 				return null;
 			}
 			
@@ -128,11 +129,16 @@ private static string [] ParseGlobalOptions (string [] args)
 		private static int Init (IList<string> args)
 		{
 			if (args.Count < 1) {
-				Console.WriteLine ("manos --init <AppName>");
+				Console.WriteLine (string.Format ("{0} --init <AppName>", MANOS_TOOLNAME));
 				Console.WriteLine ("This will initialize a new application with the supplied name.");
 			}
 				
 			Driver d = new Driver ();
+
+			if (args.Count <= 0) {
+				Console.WriteLine ("Error: Unable to init without an AppName.");
+				return 1;
+			}
 			
 			try {
 				Console.WriteLine ("initing: {0}", args [0]);
@@ -276,18 +282,24 @@ public void RunBuild ()
 
 		private static int ShowEnvironment (IList<string> args)
 		{
-			Console.WriteLine ("libdir: '{0}'", Environment.LibDirectory);
-			Console.WriteLine ("manosdir: '{0}'", Environment.ManosDirectory);
-			Console.WriteLine ("workingdir: '{0}'", Environment.WorkingDirectory);
-			Console.WriteLine ("datadir: '{0}'", Environment.DataDirectory);
-			Console.WriteLine ("datadir: '{0}'", Environment.DocsDirectory);
+			if (Environment.IsWindows) {
+				Console.WriteLine ("manosdir: '{0}'", Environment.ManosDirectory);
+				Console.WriteLine ("datadir: '{0}'", Environment.DataDirectory);
+				Console.WriteLine ("docsdir: '{0}'", Environment.DocsDirectory);
+			} else {
+				Console.WriteLine ("libdir: '{0}'", Environment.LibDirectory);
+				Console.WriteLine ("manosdir: '{0}'", Environment.ManosDirectory);
+				Console.WriteLine ("workingdir: '{0}'", Environment.WorkingDirectory);
+				Console.WriteLine ("datadir: '{0}'", Environment.DataDirectory);
+				Console.WriteLine ("docsdir: '{0}'", Environment.DocsDirectory);
+			}
 
 			return 1;
 		}
 
 		private static void ShowHelp (OptionSet os)
 		{
-			Console.WriteLine ("manos usage is: manos [command] [options]");
+			Console.WriteLine (string.Format ("{0} usage is: {0} [command] [options]", MANOS_TOOLNAME));
 			Console.WriteLine ();
 			os.WriteOptionDescriptions (Console.Out);
 		}
diff --git a/src/manostool/Environment.cs b/src/manostool/Environment.cs
index 69bc797b..b861cc78 100644
--- a/src/manostool/Environment.cs
+++ b/src/manostool/Environment.cs
@@ -39,6 +39,7 @@ public Environment ()
 			LibDirectory = "lib";
 			TemplatesDirectory = "Templates";
 			WorkingDirectory = Directory.GetCurrentDirectory ();
+			IsWindows = false;
 			
 			string exe_path = new Uri (typeof (Driver).Assembly.GetName ().CodeBase).LocalPath;
 
@@ -46,6 +47,7 @@ public Environment ()
 				|| System.Environment.OSVersion.Platform == PlatformID.Win32S
 				|| System.Environment.OSVersion.Platform == PlatformID.Win32Windows
 				|| System.Environment.OSVersion.Platform == PlatformID.WinCE) {
+				IsWindows = true;
 				ManosDirectory = Path.GetDirectoryName(exe_path);
 				DataDirectory = ManosDirectory;
 				DocsDirectory = Path.Combine(ManosDirectory, "docs");
@@ -88,5 +90,10 @@ public string DocsDirectory {
 			get;
 			set;
 		}
+
+		public bool IsWindows {
+			get;
+			private set;
+		}
 	}
 }