diff --git a/manual/C/authors.xml b/manual/C/authors.xml
index 3b1e689b9..f8eaa1873 100644
--- a/manual/C/authors.xml
+++ b/manual/C/authors.xml
@@ -87,7 +87,7 @@ If you know of somebody else who should be listed here, please let us know.
       
       <para>
       To find more information about &app;, please visit the 
-      <ulink url="http://gramps.sourceforge.net" type="http">GRAMPS Project 
+      <ulink url="http://gramps-project.org/" type="http">GRAMPS Project 
       Web page</ulink>. </para>
     <para>
       To report a bug or make a suggestion regarding this application or
diff --git a/manual/C/bugs.xml b/manual/C/bugs.xml
index df83cfc8f..0c4734fcd 100644
--- a/manual/C/bugs.xml
+++ b/manual/C/bugs.xml
@@ -24,13 +24,31 @@
 
   <title>Known Bugs and Limitations</title>
 
-<para>The known limitations include the BSDDB performance issues related
-to caching and the memory size. As long as the BSDDB cache fits completely
-into the available memory on the system, the performance should be
-adequate. When the cache size exceeds that of the free memory and
-portions of database cache start to be swapped onto the disk, the performance
-degrades appreciably. This can be solved by adjusting the BSDDB cache
-size for the large databases.
-</para>
+  <variablelist>
+    <varlistentry>
+      <term>Memory size and performance</term>
+      <listitem>
+        <para>The known limitations include the BSDDB performance issues related
+        to caching and the memory size. As long as the BSDDB cache fits completely
+        into the available memory on the system, the performance should be
+        adequate. When the cache size exceeds that of the free memory and
+        portions of database cache start to be swapped onto the disk, the performance
+        degrades appreciably. This can be solved by adjusting the BSDDB cache
+        size for the large databases.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 
+  <variablelist>
+    <varlistentry>
+      <term>GEDCOM Editing</term>
+      <listitem>
+        <para>Please keep in mind that some information in GEDCOM file may be
+        lost during import into GRAMPS. Simply opening and viewing the file
+        will not change it. However, if any changes were made and they were
+        not abandoned upon exit, exiting GRAMPS will save the data, with the
+        possible data loss.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 </appendix >
diff --git a/manual/C/faq.xml b/manual/C/faq.xml
index 8934f9fc9..2b272d904 100644
--- a/manual/C/faq.xml
+++ b/manual/C/faq.xml
@@ -51,8 +51,8 @@
       <listitem>
         <para> 
 	  &app; can be downloaded from <ulink
-	  url="http://sf.net/projects/gramps"
-	  type="http">http://sf.net/projects/gramps</ulink> at no
+	  url="http://gramps-project.org/"
+	  type="http">http://gramps-project.org/</ulink> at no
 	  charge.  &app; is an Open Source project covered by the GNU
 	  General Public License.  You have full access to the source
 	  code and are allowed to distribute the program and source
diff --git a/manual/C/getstart.xml b/manual/C/getstart.xml
index 02d0ed902..b7d7e61cc 100644
--- a/manual/C/getstart.xml
+++ b/manual/C/getstart.xml
@@ -120,7 +120,7 @@
     </para>
     <para>
       This information can be entered at any time in the
-      <guilabel>Preferences</guilabel> dialog, under the
+      <guilabel>Preferences</guilabel> dialog (see <xref linkend="gramps-prefs" />), under the
       <guilabel>Database/Researcher Information</guilabel> category.
     </para>
   </sect1>
@@ -157,9 +157,9 @@
       If you would like to open an existing database, check the top
       radio button and click the <guibutton>OK</guibutton>
       button. You will then be asked to specify the name of your
-      existing database. If you would like to immediately create a
+      existing database (see <xref linkend="open-db" />). If you would like to immediately create a
       brand new database from scratch right away, choose new
-      database.
+      database (see <xref linkend="new-db" />).
     </para> 
 
     <note id="file-notdir-note">
@@ -188,7 +188,7 @@
         <term>User manual</term>
 	<listitem> 
           <para>
-            Select this item to access this manual in the help browser.  
+            Select this item to access this manual in the help browser.
           </para>
         </listitem>
       </varlistentry>
@@ -200,6 +200,9 @@
             Select this item to read the Frequently Asked Questions about
             &app; in the browser.
           </para>
+          <para>
+            See: <xref linkend="faq" />
+          </para>
         </listitem>
       </varlistentry>
 
@@ -208,7 +211,10 @@
    	<listitem>
           <para> 
             Select this item to open the home page of &app; in your
-	    default web browser. 
+	    default web browser.
+          </para>
+          <para>
+            See: <ulink url="http://gramps-project.org/" type="http">http://gramps-project.org/</ulink>
           </para>
         </listitem>
       </varlistentry> 
@@ -218,7 +224,10 @@
 	<listitem>
           <para>
             Select this item to direct your web browser 
- 	    to the &app; mailing list archives. 
+ 	    to the &app; mailing list archives.
+          </para>
+          <para>
+            See: <ulink url="http://sourceforge.net/mail/?group_id=25770" type="http">http://sourceforge.net/mail/?group_id=25770</ulink>
           </para>
         </listitem>
       </varlistentry>
@@ -228,7 +237,10 @@
 	<listitem>
           <para> 
             Select this item to file a bug report regarding &app; 
-	    with the bug tracking system.  
+	    with the bug tracking system.
+          </para>
+          <para>
+            See: <ulink url="http://sourceforge.net/tracker/?group_id=25770&amp;atid=385137" type="http">http://sourceforge.net/tracker/?group_id=25770&amp;atid=385137</ulink>
           </para>
         </listitem>
       </varlistentry>
diff --git a/manual/C/mainwin.xml b/manual/C/mainwin.xml
index e100c513b..cf6c79096 100644
--- a/manual/C/mainwin.xml
+++ b/manual/C/mainwin.xml
@@ -117,12 +117,12 @@
 	  information, depending on the currently selected View. The
 	  following six Views are available in &app;:
   	    <itemizedlist>	
-	      <listitem><para>People View</para></listitem>
-	      <listitem><para>Family View</para></listitem>
-	      <listitem><para>Pedigree View</para></listitem>
-	      <listitem><para>Sources View</para></listitem>
-  	      <listitem><para>Places View</para></listitem>
-	      <listitem><para>Media View</para></listitem>
+	      <listitem><para>People View, see <xref linkend="people-view"/></para></listitem>
+	      <listitem><para>Family View, see <xref linkend="family-view"/></para></listitem>
+	      <listitem><para>Pedigree View, see <xref linkend="pedigree-view"/></para></listitem>
+	      <listitem><para>Sources View, see <xref linkend="sources-view"/></para></listitem>
+  	      <listitem><para>Places View, see <xref linkend="places-view"/></para></listitem>
+	      <listitem><para>Media View, see <xref linkend="media-view"/></para></listitem>
  	    </itemizedlist>
 	</para>
       </listitem>
@@ -331,7 +331,7 @@
 
 	<para>
           When &app; opens a database, the filter is set to the
-	  trivial filter called <guilabel>All people</guilabel>,
+	  trivial filter called <guilabel>Entire Database</guilabel>,
 	  i.e. no filtering is in effect. To choose a filter, use the
 	  pop-up <guilabel>Filter</guilabel> menu above the people's
 	  list. Once the filter is chosen, click the
@@ -339,7 +339,15 @@
 	  corner of the window. The filtering will take effect upon
 	  clicking the <guibutton>Apply</guibutton> button.
          </para>
-	  
+
+	<para>
+          GRAMPS provides a way to create cutom filters to easily show
+      specific parts of the database. This is achieved using the 
+      <guilabel>Custom Filter Editor</guilabel> in the <menuchoice>
+      <guimenu>Tools</guimenu> <guimenuitem>Utilities</guimenuitem>
+      </menuchoice> menu. See <xref linkend="tools-util-cfe" />
+         </para>
+
 	 <tip id="filt-tip">
            <title>Example filter use</title>
 	   <para>