diff --git a/guide/C/ch_basics.xml b/guide/C/ch_basics.xml
index a93b06f81..d14a86b06 100644
--- a/guide/C/ch_basics.xml
+++ b/guide/C/ch_basics.xml
@@ -638,17 +638,18 @@
 		require access to a MySQL or PostgreSQL database server and the installation of 
 		additional database drivers on your machine.</para>
 		
-		<note>
+		<tip>
 		<para>Users can change the format at any time by using <menuchoice><guimenu>File</guimenu> 
 		<guimenuitem>Save As...</guimenuitem></menuchoice>. This will create a copy of 
 		the data file in the selected format.</para>
-		</note>
+		</tip>
 	</sect2>
 
 	<sect2 id="basics-files-storage-comparison">
 		<title>Storage Comparison and Recommendations</title>
 		<para>Each storage format has benefits and shortcomings that users should 
-		consider for their needs and abilities. See the Storage Comparison Table below 
+		consider for their needs and abilities. See the 
+		<link linkend='basics-storage-comparison-table' endterm="basics-storage-comparison-table.title"/> below 
 		for further details.</para>
 		
 		<para>The <acronym>XML</acronym> format is the most stable and established, 
@@ -658,7 +659,7 @@
 		<acronym>SQL</acronym> storage without the overhead of installing or managing 
 		a full <acronym>DBMS</acronym>. MySQL and PostgreSQL require the installation 
 		of MySQL and PostgreSQL <acronym>DBMS</acronym>, respectively, and are best 
-		implemented only by experienced database administrators.</para>
+		maintained only by experienced database administrators.</para>
 			
 		<note>
 			<para>Use of a <acronym>SQL</acronym> back end for storage implies to many 
@@ -668,9 +669,9 @@
 			although it is a long term goal of the development team. </para>
 		</note>
 	</sect2>
-	<sect2 id="basics-files-storagetable">
+	<sect2 id="basics-storage-comparison-tblsect">
 		<title>Storage Comparison Table</title>
-		<table frame="topbot" id="storage-comparison">
+		<table frame="topbot" id="basics-storage-comparison-table">
 			<title>Storage Comparison</title>
 
 			<tgroup align="left" cols="5">