Index: client/CMT.cpp
===================================================================
--- client/CMT.cpp	(revision 3810)
+++ client/CMT.cpp	(working copy)
@@ -778,7 +778,7 @@
 
 	if(suggestedBpp != bpp)
 	{
-		logGlobal->infoStream() << boost::format("Using %s bpp (bits per pixel) for the video mode. Default or overriden setting was %s bpp.") % suggestedBpp % bpp;
+		logGlobal->infoStream() << boost::format("Using %s bpp (bits per pixel) for the video mode. Default or overridden setting was %s bpp.") % suggestedBpp % bpp;
 	}
 
 	//For some reason changing fullscreen via config window checkbox result in SDL_Quit event
Index: client/icons/vcmiclient.desktop
===================================================================
--- client/icons/vcmiclient.desktop	(revision 3810)
+++ client/icons/vcmiclient.desktop	(working copy)
@@ -7,3 +7,4 @@
 Exec=vcmiclient
 Categories=Game;StrategyGame;
 Version=1.0
+Keywords=heroes;homm3;
Index: launcher/vcmilauncher.desktop
===================================================================
--- launcher/vcmilauncher.desktop	(revision 3810)
+++ launcher/vcmilauncher.desktop	(working copy)
@@ -7,3 +7,4 @@
 Exec=vcmilauncher
 Categories=Game;StrategyGame;
 Version=1.0
+Keywords=heroes;homm3;
Index: lib/Connection.cpp
===================================================================
--- lib/Connection.cpp	(revision 3810)
+++ lib/Connection.cpp	(working copy)
@@ -397,7 +397,7 @@
 
 			if(fileVersion == version)
 			{
-                logGlobal->warnStream() << fname << " seems to have different endianess! Entering reversing mode.";
+                logGlobal->warnStream() << fname << " seems to have different endianness! Entering reversing mode.";
 				reverseEndianess = true;
 			}
 			else
Index: lib/NetPacksLib.cpp
===================================================================
--- lib/NetPacksLib.cpp	(revision 3810)
+++ lib/NetPacksLib.cpp	(working copy)
@@ -632,7 +632,7 @@
 {
 	if(!army->hasStackAtSlot(slot))
 	{
-        logNetwork->warnStream() << "Warning: " << army->nodeName() << " dont have a stack at slot " << slot;
+        logNetwork->warnStream() << "Warning: " << army->nodeName() << " don't have a stack at slot " << slot;
 		return nullptr;
 	}
 	return &army->getStack(slot);
Index: server/CVCMIServer.cpp
===================================================================
--- server/CVCMIServer.cpp	(revision 3810)
+++ server/CVCMIServer.cpp	(working copy)
@@ -533,6 +533,27 @@
 	}
 
 	po::notify(cmdLineOptions);
+
+    if (cmdLineOptions.count("help"))
+    {
+        printf("%s - A Heroes of Might and Magic 3 clone\n", GameConstants::VCMI_VERSION.c_str());
+        printf("Copyright (C) 2007-2014 VCMI dev team - see AUTHORS file\n");
+        printf("This is free software; see the source for copying conditions. There is NO\n");
+        printf("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n");
+        printf("\n");
+        printf("Usage:\n");
+        std::cout << opts;
+        exit(0);
+    }
+
+    if (cmdLineOptions.count("version"))
+    {
+        printf("%s\n", GameConstants::VCMI_VERSION.c_str());
+        printf("  data directory:    %s\n", VCMIDirs::get().dataPaths().back().c_str());
+        printf("  library directory: %s\n", VCMIDirs::get().libraryPath().c_str()); 
+        printf("  path to server:    %s\n", VCMIDirs::get().serverPath().c_str());
+        exit(0);
+    }
 }
 
 #if defined(__GNUC__) && !defined (__MINGW32__)