diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index f582738f9bc..359c9fdedb6 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -120,7 +120,7 @@ GetTokenInformation( HANDLE token, TOKEN_INFORMATION_CLASS tokeninfoclass,
 
 BOOL WINAPI SetThreadToken(PHANDLE thread, HANDLE token)
 {
-    FIXME("(%p, %x): stub\n", thread, token);
+    FIXME("(%p, %x): stub (NT impl. only)\n", thread, token);
 
     SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 
diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
index bbc1b2d4821..39cf28bd627 100644
--- a/dlls/winmm/lolvldrv.c
+++ b/dlls/winmm/lolvldrv.c
@@ -2544,7 +2544,7 @@ static BOOL	MMDRV_InitFromRegistry(void)
 static BOOL	MMDRV_InitHardcoded(void)
 {
     ERR("You didn't setup properly the config file for the Wine multimedia modules.\n"
-	"Will use the hard-coded setup, but this will disapear soon.\n"
+	"Will use the hard-coded setup, but this will disappear soon.\n"
 	"Please add a WinMM section to your Wine config file.\n");
 
     /* first load hardware drivers */
diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
index af60b3ad1f0..ad7a2d6be39 100644
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -543,7 +543,7 @@ static FOURCC MMIO_ParseExt(LPCSTR szFileName)
 /**************************************************************************
  *				MMIO_Get			[internal]
  *
- * Retirieves from current process the mmio object
+ * Retrieves the mmio object from current process
  */
 static	LPWINE_MMIO	MMIO_Get(LPWINE_MM_IDATA iData, HMMIO h)
 {
diff --git a/documentation/.cvsignore b/documentation/.cvsignore
index b457b5d54a0..8dd9e444acc 100644
--- a/documentation/.cvsignore
+++ b/documentation/.cvsignore
@@ -2,6 +2,7 @@
 *.dvi
 *.junk
 *.log
+*.out
 *.tex
 DBTOHTML_OUTPUT_DIR*
 Makefile
diff --git a/documentation/wine.man.in b/documentation/wine.man.in
index 45ae9da133a..63d44b0d21d 100644
--- a/documentation/wine.man.in
+++ b/documentation/wine.man.in
@@ -168,7 +168,13 @@ or in Unix format (
 ).  You may pass arguments to the program being executed by adding them 
 to the end of the command line invoking
 .B wine
-(such as: wine notepad C:\(rs\(rsTEMP\(rs\(rsREADME.TXT). Command line processing goes as
+(such as: wine notepad C:\(rs\(rsTEMP\(rs\(rsREADME.TXT).
+Note that you need to '\(rs' escape special characters (and spaces) when invoking Wine via
+a shell, e.g.
+.PP
+wine C:\(rs\(rsProgram\(rs Files\(rs\(rsMyPrg\(rs\(rstest.exe
+.PP
+Command line processing goes as
 follows: first 
 .B wine
 checks whether one or more of the above mentioned 
diff --git a/loader/pe_image.c b/loader/pe_image.c
index 16b7a17b966..bc9f52689f0 100644
--- a/loader/pe_image.c
+++ b/loader/pe_image.c
@@ -383,7 +383,7 @@ static int do_relocations( char *base, const IMAGE_NT_HEADERS *nt, const char *f
     if (!dir->VirtualAddress || !dir->Size)
     {
         if (nt->OptionalHeader.ImageBase == 0x400000)
-            ERR("Standard load address for a Win32 program not available - patched kernel ?\n");
+            ERR("Standard load address for a Win32 program (0x00400000) not available - patched kernel ?\n");
         ERR( "FATAL: Need to relocate %s, but no relocation records present (%s). Try to run that file directly !\n",
              filename,
              (nt->FileHeader.Characteristics&IMAGE_FILE_RELOCS_STRIPPED)?
@@ -455,7 +455,7 @@ static int do_relocations( char *base, const IMAGE_NT_HEADERS *nt, const char *f
  * (at least) Linux does only support offsets which are page-aligned.
  *
  * BUT we have to map the whole image anyway, for Win32 programs sometimes
- * want to access them. (HMODULE32 point to the start of it)
+ * want to access them. (HMODULE points to the start of it)
  */
 HMODULE PE_LoadImage( HANDLE hFile, LPCSTR filename, DWORD flags )
 {
diff --git a/misc/version.c b/misc/version.c
index 823021d3ee4..cfefc381610 100644
--- a/misc/version.c
+++ b/misc/version.c
@@ -78,6 +78,9 @@ static VERSION_DATA VersionData[NB_WINDOWS_VERSIONS] =
         0x07000304,
         0xC0000004,
 	{
+	    /* 0x40003B6 == 4.00.950 == Win95 orig. release and Win95a
+	     * 0x4000457 == 4.00.1111 == Win95B aka Win95 OSR2
+	     * Win95a/B can be discerned via regkey SubVersionNumber */
             sizeof(OSVERSIONINFOA), 4, 0, 0x40003B6,
             VER_PLATFORM_WIN32_WINDOWS, "Win95"
 	}
diff --git a/ole/ole2nls.c b/ole/ole2nls.c
index 38f90194c65..b16a0efa880 100644
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -2529,7 +2529,7 @@ UINT WINAPI CompareStringW(DWORD lcid, DWORD fdwStyle,
 {
 	int len,ret;
 	if(fdwStyle & NORM_IGNORENONSPACE)
-		FIXME("IGNORENONSPACE not supprted\n");
+		FIXME("IGNORENONSPACE not supported\n");
 	if(fdwStyle & NORM_IGNORESYMBOLS)
 		FIXME("IGNORESYMBOLS not supported\n");