diff --git a/doc/olap4j-arch.vsd b/doc/olap4j-arch.vsd
index eed1617..507b3be 100755
Binary files a/doc/olap4j-arch.vsd and b/doc/olap4j-arch.vsd differ
diff --git a/doc/olap4j-metadata.png b/doc/olap4j-metadata.png
new file mode 100755
index 0000000..05d32ae
Binary files /dev/null and b/doc/olap4j-metadata.png differ
diff --git a/doc/olap4j_fs.html b/doc/olap4j_fs.html
index 4563e96..0157800 100644
--- a/doc/olap4j_fs.html
+++ b/doc/olap4j_fs.html
@@ -1,7 +1,8 @@
 <html><head>
 
 <meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"><title>olap4j Functional Specification</title>
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"><title>
+olap4j Specification</title>
 
 <style type="text/css">
 CODE {
@@ -75,7 +76,7 @@
 
 <body>
 
-<h1>olap4j Functional Specification</h1>
+<h1>olap4j Specification</h1>
 
 <p>Authors: Julian Hyde, Barry Klawans<br>
 Version: 0.89.3-dev (draft)<br>
@@ -100,6 +101,7 @@ <h2><a name="Contents">Contents</a></h2>
 		standard Java API for OLAP</a></li>
 		<li><a href="#Architecture_of_olap4j">Architecture of olap4j</a></li>
         <li><a href="#Compatibility">Compatibility</a></li>
+		<li><a href="#Compliance_levels">Compliance levels</a></li>
 	</ol>
 	</li>
 	<li><a href="#Components_of_the_API">Components of the API</a><ol>
@@ -108,80 +110,82 @@ <h2><a name="Contents">Contents</a></h2>
         <li><a href="#The_DriverManager_class">The DriverManager class</a></li>
         <li><a href="#The_DataSource_interface">The DataSource interface</a></li>
         <li><a href="#The_OlapException_class">The OlapException class</a></li>
-        <li><a href="#Internationalization">Internationalization</a></li>
 	</ol>
 	    </li>
 		<li><a href="#Connections">Connections</a><ol>
-		<li><a href="#Connection_pooling">Connection pooling</a></li>
-		<li><a href="#OlapConnection">The OlapConnection interface</a></li>
-		<li><a href="#The_OlapWrapper_interface">The OlapWrapper interface</a></li>
-	</ol>
-		</li>
+			<li><a href="#Connection_pooling">Connection pooling</a></li>
+			<li><a href="#OlapConnection">The OlapConnection interface</a></li>
+			<li><a href="#The_OlapWrapper_interface">The OlapWrapper interface</a></li>
+			<li><a href="#The_OlapDatabaseMetaData_interface">The OlapDatabaseMetaData interface</a></li>
+		</ol></li>
 		<li><a href="#Statements">Statements</a><ol>
-		<li><a href="#OlapStatement">The OlapStatement interface</a></li>
-		<li><a href="#PreparedOlapStatement">The PreparedOlapStatement interface</a></li>
-        <li><a href="#OlapParameterMetaData">The OlapParameterMetaData interface</a></li>
-        <li><a href="#CellSet">The CellSet interface</a></li>
-        <li><a href="#CellSetAxis">The CellSetAxis interface</a></li>
-        <li><a href="#The_CellSetAxisMetaData_interface">The CellSetAxisMetaData interface</a></li>
-        <li><a href="#The_Position_interface">The Position interface</a></li>
-        <li><a href="#Cell">The Cell interface</a></li>
-        <li><a href="#The_CellSetMetaData_interface">The CellSetMetaData interface</a></li>
-        <li><a href="#The_OlapDatabaseMetaData_interface">The OlapDatabaseMetaData interface</a></li>
-	</ol>
-		</li>
+			<li><a href="#OlapStatement">The OlapStatement interface</a></li>
+			<li><a href="#PreparedOlapStatement">The PreparedOlapStatement interface</a></li>
+			<li><a href="#OlapParameterMetaData">The OlapParameterMetaData interface</a></li>
+			<li><a href="#CellSet">The CellSet interface</a></li>
+			<li><a href="#CellSetAxis">The CellSetAxis interface</a></li>
+			<li><a href="#The_Axis_enum">The Axis enum</a></li>
+			<li><a href="#The_CellSetAxisMetaData_interface">The CellSetAxisMetaData interface</a></li>
+			<li><a href="#The_Position_interface">The Position interface</a></li>
+			<li><a href="#Cell">The Cell interface</a></li>
+			<li><a href="#The_CellSetMetaData_interface">The CellSetMetaData interface</a></li>
+		</ol></li>
 		<li><a href="#MDX_query_model">MDX parse tree model</a><ol>
-		<li><a href="#The_ParseTreeWriter_class">The ParseTreeWriter class</a></li>
-	</ol>
-		</li>
-        <li><a href="#MDX_parser">MDX parser</a></li>
+			<li><a href="#The_ParseTreeWriter_class">The ParseTreeWriter class</a></li>
+		</ol></li>
+		<li><a href="#MDX_parser">MDX parser</a></li>
 		<li><a href="#MDX_type_model">MDX type model</a></li>
 		<li><a href="#Metadata">Metadata</a><ol>
-		<li><a href="#Access_control">Access control</a></li>
-		<li><a href="#Metadata_objects">Metadata objects</a><ol>
-		<li><a href="#MetadataElement">The MetadataElement interface</a></li>
-        <li><a href="#Catalog">The Catalog interface</a></li>
-        <li><a href="#Schema">The Schema interface</a></li>
-		<li><a href="#Cube">The Cube interface</a></li>
-		<li><a href="#Dimension">The Dimension interface</a></li>
-		<li><a href="#Hierarchy">The Hierarchy interface</a></li>
-		<li><a href="#Level">The Level interface</a></li>
-		<li><a href="#Member">The Member interface</a></li>
-		<li><a href="#Measure">The Measure interface</a></li>
-		<li><a href="#Property">The Property interface</a></li>
-	</ol></li>
-		<li>
-        <a href="#The_OlapDatabaseMetaData_interface_and_methods_which_return_schema_rowsets">
-        The OlapDatabaseMetaData interface, and schema result sets</a><ol>
-		<li><a href="#getDatasources">The getDatasources method</a></li>
-		<li><a href="#getDatabaseProperties">The getDatabaseProperties method</a></li>
-		<li><a href="#getLiterals">The getLiterals method</a></li>
-		<li><a href="#getCubes">The getCubes method</a></li>
-		<li><a href="#getDimensions">The getDimensions method</a></li>
-		<li><a href="#getFunctions">The getFunctions method</a></li>
-		<li><a href="#getHierarchies">The getHierarchies method</a></li>
-		<li><a href="#getLevels">The getLevels method</a></li>
-		<li><a href="#getMeasures">The getMeasures method</a></li>
-		<li><a href="#getMembers">The getMembers method</a></li>
-		<li><a href="#getProperties">The getProperties method</a></li>
-		<li><a href="#getSets">The getSets method</a></li>
-	</ol></li>
-		<li><a href="#Other_methods">Other methods</a></li>
-	</ol></li>
+			<li><a href="#Access_control">Access control</a></li>
+			<li><a href="#Metadata_objects">Metadata objects</a><ol>
+				<li><a href="#MetadataElement">The MetadataElement interface</a></li>
+				<li><a href="#Catalog">The Catalog interface</a></li>
+				<li><a href="#Schema">The Schema interface</a></li>
+				<li><a href="#Cube">The Cube interface</a></li>
+				<li><a href="#Dimension">The Dimension interface</a></li>
+				<li><a href="#Hierarchy">The Hierarchy interface</a></li>
+				<li><a href="#Level">The Level interface</a></li>
+				<li><a href="#Member">The Member interface</a></li>
+				<li><a href="#Measure">The Measure interface</a></li>
+				<li><a href="#Property">The Property interface</a></li>
+			</ol></li>
+			<li>
+			<a href="#The_OlapDatabaseMetaData_interface_and_methods_which_return_schema_rowsets">The OlapDatabaseMetaData interface, and schema result sets</a><ol>
+				<li><a href="#getDatasources">The getDatasources method</a></li>
+				<li><a href="#getDatabaseProperties">The getDatabaseProperties method</a></li>
+				<li><a href="#getLiterals">The getLiterals method</a></li>
+				<li><a href="#getCubes">The getCubes method</a></li>
+				<li><a href="#getDimensions">The getDimensions method</a></li>
+				<li><a href="#getFunctions">The getFunctions method</a></li>
+				<li><a href="#getHierarchies">The getHierarchies method</a></li>
+				<li><a href="#getLevels">The getLevels method</a></li>
+				<li><a href="#getMeasures">The getMeasures method</a></li>
+				<li><a href="#getMembers">The getMembers method</a></li>
+				<li><a href="#getProperties">The getProperties method</a></li>
+				<li><a href="#getSets">The getSets method</a></li>
+			</ol></li>
+			<li><a href="#Other_methods">Other methods</a></li>
+		</ol></li>
 		<li><a href="#Transform">Transform</a></li>
 		<ol>
-		    <li><a href="#Query_Model_Details">Query model details</a></li>
-		    <li><a href="#Navigation_Actions">Navigation actions</a></li>
+			<li><a href="#Query_Model_Details">Query model details</a></li>
+			<li><a href="#Navigation_Actions">Navigation actions</a></li>
 		    <ol>
-		        <li><a href="#Slicing_navigations">Slicing navigations</a></li>
-		        <li><a href="#Restructuring_navigations">Restructuring navigations</a></li>
-		        <li><a href="#Drilling_navigations">Drilling navigations</a></li>
-		        <li><a href="#Scoping_navigations">Scoping navigations</a></li>
-		    </ol>
-		    <li><a href="#Open_Nav_Issues">Open issues</a></li>
+				<li><a href="#Slicing_navigations">Slicing navigations</a></li>
+				<li><a href="#Restructuring_navigations">Restructuring navigations</a></li>
+				<li><a href="#Drilling_navigations">Drilling navigations</a></li>
+				<li><a href="#Scoping_navigations">Scoping navigations</a></li>
+			</ol>
+			<li><a href="#Open_Nav_Issues">Open issues</a></li>
 		</ol>
 		<li><a href="#Layout">Layout</a></li>
 	</ol>
+	</li>
+	<li><a href="#Other_topics">Other topics</a><ol>
+	<li><a href="#Internationalization">Internationalization</a></li>
+	<li><a href="#Concurrency_and_thread-safety">Concurrency and thread-safety</a></li>
+	<li><a href="#Canceling_statements">Canceling statements</a></li>
+</ol>
 	</li>
 	<li><a href="#Other_components">Other components</a><ol>
 		<li><a href="#Test_suite">Test suite</a></li>
@@ -382,6 +386,50 @@ <h3>1.6. <a name="Compatibility">Compatibility</a></h3>
 
 <p>olap4j's JDBC support is consistent with JDBC version 3.0 (which was introduced in JDK 1.4 and
 is also in JDK 1.5) and also with JDBC version 4.0 (introduced in JDK 1.6).</p>
+<h3>1.7. <a name="Compliance_levels">Compliance levels</a></h3>
+<p>There are two compliance levels to which a driver can support olap4j. olap4j 
+is a rich specification, and it takes a considerable effort to implement it 
+fully, but applications can still be built on a driver which only implements the 
+core parts of the specification. The lower level allows a vendor to a subset of 
+the specification without the significant investment of a fully-compliant 
+driver.</p>
+<p>The compliance levels are as follows:</p>
+<ul>
+	<li><b>olap4j Core Compliance</b>. To comply with the olap4j core 
+	specification, it must implement all classes in the <code>org.olap4j</code> 
+	package, with the exception of the <code>get<i>Xxxx</i>s()</code> methods in
+	<a class="javadoc" href="api/org/olap4j/OlapDatabaseMetaData.html">
+	OlapDatabaseMetaData</a> that return result sets, and all classes in the
+	<code>org.olap4j.metadata</code> package. The OLAP server must also 
+	implement the fundamental features of the MDX language (see below).</li>
+	<li><b>olap4j Full Compliance</b>. To fully comply with the olap4j 
+	specification, a driver must comply with the core requirements, plus 
+	implement the
+	<a class="javadoc" href="api/org/olap4j/OlapDatabaseMetaData.html">
+	OlapDatabaseMetaData</a>.<code>get<i>Xxxx</i>s()</code> methods, plus 
+	implements an MDX parser and validator (<code>org.olap4j.mdx.parser</code> 
+	package).</li>
+</ul>
+<h4><a name="MDX_language_compliance">MDX language compliance</a></h4>
+<p>All olap4j drivers must implement the fundamental features of the MDX 
+language, but olap4j compliance levels do not imply a particular degree of 
+support for the MDX language.</p>
+<p>The fundamental features of MDX are:</p>
+<ul>
+	<li>Queries of the form &quot;SELECT ... FROM ... WHERE&quot;.</li>
+	<li>The set constructor operator { ... }.</li>
+	<li>Set functions CrossJoin(&lt;Set&gt;, &lt;Set&gt;), Filter(&lt;Set&gt;, &lt;Condition&gt;), 
+	Order(&lt;Set&gt;, &lt;Expression&gt;), Hierarchize(&lt;Set&gt;).</li>
+	<li>Navigation operators &lt;Member&gt;.Children, &lt;Level&gt;.Members 
+	&lt;Hierarchy&gt;.Members, &lt;Member&gt;.Parent, Level, Hierarchy, Dimension</li>
+	<li>Aggregation functions Aggregate</li>
+	<li>Basic arithmetic and logical operators</li>
+</ul>
+<p align="left">Of course, a provider may implement a larger subset of MDX, and 
+most do. A provider can describe its MDX compliance level by describing the 
+additional features it supports (e.g. WITH MEMBER, WITH SET, NON EMPTY, and 
+HAVING clauses in queries; virtual cubes; and calculated members and sets 
+defined against cubes) and additional functions and operators implemented.</p>
 
 <h2>
 2.
@@ -444,14 +492,6 @@ <h4>2.1.4 <a name="The_OlapException_class">The OlapException class</a></h4>
     <li><code>void setContext(Object context)</code></li>
 </ul>
 
-<h4>2.1.5. <a name="Internationalization">Internationalization</a></h4>
-<p>[move this section elsewhere]</p>
-<p>Suppose one cube is available in English and French, and in French and 
-Spanish, and both are shown in same portal. Clients typically say that seeing 
-reports in a mixture of languages is confusing; the portal would figure out the 
-best common language, in this case French. Cube and Schema have <code>
-getSupportedLocales()</code> methods for this purpose.</p>
-
 <h3>2.2. <a name="Connections">Connections</a></h3>
 
 <p>olap4j's connection management component manages connections to the OLAP server,
@@ -617,6 +657,23 @@ <h4>2.2.3. <a name="The_OlapWrapper_interface">The OlapWrapper interface</a></h4
 	<li><code>T unwrap(Class&lt;T&gt;)</code></li>
 </ul>
 
+<h4>2.2.4. <a name="The_OlapDatabaseMetaData_interface">The OlapDatabaseMetaData interface</a></h4>
+
+<p><a class="javadoc" href="api/org/olap4j/OlapDatabaseMetaData.html">
+OlapDatabaseMetaData</a> (extends 
+<a class="javadoc" href="http://java.sun.com/javase/6/docs/api/java/sql/DatabaseMetaData.html">
+java.sql.DatabaseMetaData</a>) provides information about an OLAP database.</p>
+<p>Just as 
+<a class="javadoc" href="http://java.sun.com/javase/6/docs/api/java/sql/DatabaseMetaData.html">
+DatabaseMetaData</a> provides a method to query the each kind of metadata 
+element in a relational database (tables, columns, and so forth), returning 
+the rows as a
+<a class="javadoc" href="http://java.sun.com/javase/6/docs/api/java/sql/ResultSet.html">
+ResultSet</a>, <code>OlapDatabaseMetaData</code> provides methods for OLAP 
+metadata elements (cubes, dimensions, hierarchies, levels, members, measures).</p>
+<p>These methods are described in the section &quot;<a href="#The_OlapDatabaseMetaData_interface_and_methods_which_return_schema_rowsets">The 
+<code>OlapDatabaseMetaData</code> interface and methods which return schema rowsets</a>&quot;.</p>
+
 <h3>2.3. <a name="Statements">Statements</a></h3>
 
 <h4>2.3.1. <a name="OlapStatement">The OlapStatement interface</a></h4>
@@ -721,7 +778,7 @@ <h4>2.3.5. <a name="CellSetAxis">The CellSetAxis interface</a></h4>
 
 <p>Methods:</p>
 <ul>
-    <li><code>int getOrdinal()</code></li>
+    <li><code>Axis getOrdinal()</code></li>
     <li><code>CellSet getCellSet()</code></li>
     <li><code>CellSetAxisMetaData getAxisMetaData()</code></li>
     <li><code>List&lt;Position&gt; getPositions()</code></li>
@@ -729,7 +786,11 @@ <h4>2.3.5. <a name="CellSetAxis">The CellSetAxis interface</a></h4>
     <li><code>ListIterator&lt;Position&gt; iterate()</code></li>
 </ul>
 
-<h4>2.3.6. <a name="The_CellSetAxisMetaData_interface">The CellSetAxisMetaData interface</a></h4>
+<h4>2.3.6. <a name="The_Axis_enum">The Axis enum</a></h4>
+
+<p><a class="javadoc" href="api/org/olap4j/Axis.html">Axis</a> is an enumeration of axis types.</p>
+
+<h4>2.3.7. <a name="The_CellSetAxisMetaData_interface">The CellSetAxisMetaData interface</a></h4>
 
 <p>A <a class="javadoc" href="api/org/olap4j/CellSetAxisMetaData.html">
 CellSetAxisMetaData</a> is
@@ -743,7 +804,7 @@ <h4>2.3.6. <a name="The_CellSetAxisMetaData_interface">The CellSetAxisMetaData i
     <li><code>List&lt;Property&gt; getProperties()</code></li>
 </ul>
 
-<h4>2.3.7. <a name="The_Position_interface">The Position interface</a></h4>
+<h4>2.3.8. <a name="The_Position_interface">The Position interface</a></h4>
 
 <p><a class="javadoc" href="api/org/olap4j/Position.html">Position</a>
 is a position on a <a class="javadoc" href="api/org/olap4j/CellSetAxis.html">
@@ -820,7 +881,7 @@ <h4>2.3.7. <a name="The_Position_interface">The Position interface</a></h4>
     <li><code>int getOrdinal()</code></li>
 </ul>
 
-<h4>2.3.8. <a name="Cell">The Cell interface</a></h4>
+<h4>2.3.9. <a name="Cell">The Cell interface</a></h4>
 
 <p>A <a class="javadoc" href="api/org/olap4j/Cell.html">Cell</a> is
 a cell returned from an <a class="javadoc" href="api/org/olap4j/CellSet.html">
@@ -841,7 +902,7 @@ <h4>2.3.8. <a name="Cell">The Cell interface</a></h4>
     <li><code>String getFormattedValue()</code></li>
 </ul>
 
-<h4>2.3.9. <a name="The_CellSetMetaData_interface">The CellSetMetaData interface</a></h4>
+<h4>2.3.10. <a name="The_CellSetMetaData_interface">The CellSetMetaData interface</a></h4>
 
 <p><a class="javadoc" href="api/org/olap4j/CellSetMetaData.html">CellSetMetaData</a> 
 (extends 
@@ -850,28 +911,12 @@ <h4>2.3.9. <a name="The_CellSetMetaData_interface">The CellSetMetaData interface
 <a class="javadoc" href="api/org/olap4j/CellSet.html">CellSet</a>.</p>
 <p>Methods:</p>
 <ul>
-    <li><code>List&lt;Property&gt; getCellProperties()</code></li>
+    <li><code>NamedList&lt;Property&gt; getCellProperties()</code></li>
     <li><code>Cube getCube()</code></li>
-    <li><code>List&lt;CellSetAxisMetaData&gt; getAxesMetaData()</code></li>
+    <li><code>NamedList&lt;CellSetAxisMetaData&gt; getAxesMetaData()</code></li>
+	<li><code>CellSetAxisMetaData getSlicerAxisMetaData()</code></li>
 </ul>
 
-<h4>2.3.10. <a name="The_OlapDatabaseMetaData_interface">The OlapDatabaseMetaData interface</a></h4>
-
-<p><a class="javadoc" href="api/org/olap4j/OlapDatabaseMetaData.html">
-OlapDatabaseMetaData</a> (extends 
-<a class="javadoc" href="http://java.sun.com/javase/6/docs/api/java/sql/DatabaseMetaData.html">
-java.sql.DatabaseMetaData</a>) provides information about an OLAP database.</p>
-<p>Just as 
-<a class="javadoc" href="http://java.sun.com/javase/6/docs/api/java/sql/DatabaseMetaData.html">
-DatabaseMetaData</a> provides a method to query the each kind of metadata 
-element in a relational database (tables, columns, and so forth), returning 
-the rows as a
-<a class="javadoc" href="http://java.sun.com/javase/6/docs/api/java/sql/ResultSet.html">
-ResultSet</a>, <code>OlapDatabaseMetaData</code> provides methods for OLAP 
-metadata elements (cubes, dimensions, hierarchies, levels, members, measures).</p>
-<p>These methods are described in the section &quot;<a href="#The_OlapDatabaseMetaData_interface_and_methods_which_return_schema_rowsets">The 
-<code>OlapDatabaseMetaData</code> interface and methods which return schema rowsets</a>&quot;.</p>
-
 <h3>2.4. <a name="MDX_query_model">MDX query model</a></h3>
 
 <p>The MDX query model represents a parsed MDX statement.</p>
@@ -937,7 +982,7 @@ <h3>2.4. <a name="MDX_query_model">MDX query model</a></h3>
 
 <p>Package name: <a class="javadoc" href="api/org/olap4j/mdx/package-summary.html">org.olap4j.mdx</a></p>
 
-<p>Classes:</p>
+<p>Parse tree classes:</p>
 <ul>
   <li><a class="javadoc" href="api/org/olap4j/mdx/ParseTreeNode.html">ParseTreeNode</a> is a node in a parse tree representing a parsed
 	MDX statement.</li>
@@ -971,6 +1016,13 @@ <h3>2.4. <a name="MDX_query_model">MDX query model</a></h3>
 	calculated member or set.</li>
 </ul>
 
+<p>Other classes:</p>
+<ul>
+  <li>enum <a class="javadoc" href="api/org/olap4j/mdx/Syntax.html">Syntax</a> 
+	describes the possible syntaxes for functions and operators (infix, prefix, 
+	function call, and so forth)</li>
+</ul>
+
 <h4>2.4.1 <a name="The_ParseTreeWriter_class">The ParseTreeWriter class</a></h4>
 <p><a class="javadoc" href="api/org/olap4j/mdx/ParseTreeWriter.html">
 ParseTreeWriter</a> is used in conjunction with the
@@ -993,7 +1045,7 @@ <h3>2.5. <a name="MDX_parser">MDX parser</a></h3>
 	MdxParser parser =<br>
 &nbsp;&nbsp;&nbsp; parserFactory.createMdxParser(connection);<br>
 	SelectNode select =<br>
-&nbsp;&nbsp;&nbsp; parser.parse(&quot;SELECT FROM [Sales]&quot;);<br>
+&nbsp;&nbsp;&nbsp; parser.parseSelect(&quot;SELECT FROM [Sales]&quot;);<br>
 	MdxValidator validator =<br>
 &nbsp;&nbsp;&nbsp; parserFactory.createMdxValidator(connection);<br>
 	select = validator.validate(select);</div>
@@ -1140,23 +1192,39 @@ <h3>2.7. <a name="Metadata">Metadata</a></h3>
 </ul>
 <h4>2.7.1. <a name="Access_control">Access control</a></h4>
 
-<p>A user's view of metadata may be subject to access control. For example, a
-user may not have read access to certain hierarchies within a cube, or to
-certain members within a hierarchy. The API methods must behave consistently
-with access control.</p>
-<blockquote>
-	<p><i>Example</i>: If Fred does not have access to the <code>[Nation]</code>
-	level of the <code>[Store]</code> hierarchy, then the <code>
-	Member.getParentMember()</code> method will return null if applied to <code>
-	[Store].[USA].[CA]</code>, because the 'real' parent member <code>[Store].[USA]</code>
-	is invisible to him.</p>
-</blockquote>
+<p>A user's view of metadata may be subject to access control. The precise rules 
+for access control depend on the provider, and this specification does not say 
+what those rules should be. But this specification requires that the API methods 
+must behave consistently with the server's access control policy.</p>
+<p>For example, in mondrian, users belong to roles, and roles may be granted or 
+denied access to cubes, hierarchies, or members within hierarchies. Suppose that 
+user Fred belongs to the &quot;Sales Manager&quot; role, which does not have access to the
+<code>[Nation]</code>
+	level of the <code>[Store]</code> hierarchy, and the current connection has 
+been opened in the &quot;Sales Manager&quot; role. Then the <code>Member.getParentMember()</code> method will return null if applied to 
+<code>[Store].[USA].[CA]</code>, because the 'real' parent member <code>[Store].[USA]</code> 
+is invisible to him; also, the <code>Hierarchy.getLevels()</code> and <code>
+OlapDatabaseMetaData.getLevels()</code> methods will omit the Nation level from 
+the list of levels they return.</p>
 
 <h4>2.7.2. <a name="Metadata_objects">Metadata objects</a></h4>
-<p>[Diagram of object model, showing relationships. Catalog contains Schema; 
-Schema contains Cube and shared Dimension; Cube contains Dimension, Measure and 
-Set; Measure is a Member; Dimension contains Hierarchy; Hierarchy contains 
-Level; Level contains Member and Property.]</p>
+
+<p>The following diagram shows the metadata objects in an olap4j schema.</p>
+
+<img class="std" alt="olap4j metdata objects" src="olap4j-metadata.png">
+
+<p>In the diagram, each arrow represents a collection of objects in a parent 
+object; for example, a database is a collection of catalogs, each catalog is a 
+collection of schemas, each schema is a collection of cubes, and so forth. With 
+the exception of Database, each object has a corresponding class in the <a class="javadoc" href="api/org/olap4j/metadata/package-summary.html">org.olap4j.metadata</a> 
+package; Database is represented by a combination of the
+<a class="javadoc" href="api/org/olap4j/OlapConnection.html">OlapConnection</a> 
+class (specifically the
+<a class="javadoc" href="api/org/olap4j/OlapConnection.html#getCatalogs()">
+getCatalogs()</a> method) and by
+<a class="javadoc" href="api/org/olap4j/OlapDatabaseMetaData.html">
+OlapDatabaseMetaData</a> (which describes the general capabilities of an OLAP 
+server).</p>
 <p>Most metadata objects extend the <a class="javadoc" href="api/org/olap4j/metadata/MetadataElement.html">
 MetadataElement</a> interface, which gives them <code>name</code> and <code>
 uniqueName</code> attributes, and localized <code>caption</code> and <code>
@@ -1171,7 +1239,7 @@ <h4>2.7.2. <a name="Metadata_objects">Metadata objects</a></h4>
 therefore over the course of time, different java objects may represent the same 
 underlying metadata object. Always use
 <a class="javadoc" href="http://java.sun.com/javase/6/docs/api/java/lang/Object.html#equals(java.lang.Object)">
-equals()</a>, not the <code>=</code> operator, when comparing metadata objects, 
+equals()</a>, not the <code>==</code> operator, when comparing metadata objects, 
 and do not use
 <a class="javadoc" href="http://java.sun.com/javase/6/docs/api/java/util/IdentityHashMap.html">
 IdentityHashMap</a>.</p>
@@ -1182,7 +1250,8 @@ <h5>2.7.2.1. <a name="MetadataElement">The MetadataElement interface</a></h5>
 <p>Subtypes are Cube, Dimension, Hierarchy, Level, Member, Property. 
 MetadataElement provides
 name and unique-name properties (not localized), and localized caption and
-description.</p>
+description (see <a href="#Internationalization">
+    Internationalization</a>).</p>
 <ul>
 	<li><code>String getName()</code></li>
 	<li><code>String getUniqueName()</code></li>
@@ -1240,7 +1309,7 @@ <h5>2.7.2.4. <a name="Cube">The Cube interface</a></h5>
     <li><code>List&lt;Locale&gt; getSupportedLocales()</code> (see <a href="#Internationalization">
     Internationalization</a>)</li>
 	<li><code>Member lookupMember(String... nameParts)</code></li>
-	<li><code>Member lookupMembers(Set&lt;TreeOp&gt; treeOps, String... nameParts)</code></li>
+	<li><code>List&lt;Member&gt; lookupMembers(Set&lt;TreeOp&gt; treeOps, String... nameParts)</code></li>
 </ul>
 
 <h5>2.7.2.5. <a name="Dimension">The Dimension interface</a></h5>
@@ -3364,20 +3433,57 @@ <h3>2.9. <a name="Layout">Layout</a></h3>
 <p>Package name: <a class="javadoc" href="api/org/olap4j/layout/package-summary.html">org.olap4j.layout</a></p>
 
 <p>Classes: TBD</p>
-
-<h2>3. <a name="Other_components">Other components</a></h2>
+<h2>3. <a name="Other_topics">Other topics</a></h2>
+<p>In this section we discuss aspects of the design and usage of olap4j which 
+pervade all of the components.</p>
+<h3>3.1. <a name="Internationalization">Internationalization</a></h3>
+<p>Metadata elements in olap4j can be localized. Unlike the tables and columns 
+model of relational databases and JDBC, elements of an OLAP data model appear on 
+the screen of the end-user, and the user expects these elements to appear in his 
+or her own language.</p>
+<p>A connection has a locale. For most drivers, this can be initialized using a 
+connection parameter called <code>Locale</code>. The locale can be overridden by 
+calling <code>OlapConnection.setLocale(Locale)</code>.</p>
+<p>Metadata elements Cube, Dimension, Hierarchy, Level, Member and so forth have 
+methods <code>getCaption</code> and <code>getDescription</code> (inherited from
+<a class="javadoc" href="api/org/olap4j/metadata/MetadataElement.html">
+MetadataElement</a>) which take a locale as a parameter. If the parameter locale 
+is null, the connection's locale is used.</p>
+<p>Suppose one cube is available in English and French, and in French and 
+Spanish, and both are shown in same portal. Clients typically say that seeing 
+reports in a mixture of languages is confusing; the portal would figure out the 
+best common language, in this case French. The
+<a class="javadoc" href="api/org/olap4j/metadata/Cube.html">Cube</a> and 
+<a class="javadoc" href="api/org/olap4j/metadata/Schema.html">Schema</a> objects have <code>
+getSupportedLocales()</code> methods for this purpose.</p>
+<h3>3.2. <a name="Concurrency_and_thread-safety">Concurrency and thread-safety</a></h3>
+<p>The JDBC 4.0 specification describes the thread-safety requirements for 
+drivers, and what modes of concurrency JDBC applications can assume that their 
+drivers will support. Since the olap4j specification is an extension to the JDBC 
+specification, an olap4j driver must comply with the JDBC specification in this 
+regard.</p>
+<h3>3.3. <a name="Canceling_statements">Canceling statements</a></h3>
+<p>The JDBC specification provides the
+<a class="javadoc" href="http://java.sun.com/javase/6/docs/api/java/sql/Statement.html#cancel()">
+Statement.cancel()</a> method, so that a statement which is executing in one thread may be safely terminated by another 
+thread; and
+<a class="javadoc" href="http://java.sun.com/javase/6/docs/api/java/sql/Statement.html#setQueryTimeout(int)">
+Statement.setQueryTimeout(int seconds)</a>, to request that a statement aborts 
+itself after executing for a certain period of time.</p>
+
+<h2>4. <a name="Other_components">Other components</a></h2>
 
 <p>The API described above is a set of interfaces which must be implemented by
 any compliant provider. The olap4j project also contains some components which
 are not part of the API.</p>
 
-<h3>3.1. <a name="Test_suite">Test suite</a></h3>
+<h3>4.1. <a name="Test_suite">Test suite</a></h3>
 
 <p>The olap4j project contains a TCK (Test Compatibility Kit). The TCK is a suite
 of tests which can be used to verify the compliance of an implementation of the
 API.</p>
 
-<h3>3.2. <a name="XML/A_provider">XML/A provider</a></h3>
+<h3>4.2. <a name="XML/A_provider">XML/A provider</a></h3>
 
 <p>The XML/A provider is an implementation of the olap4j API which talks to a
 generic XML/A provider.</p>
@@ -3389,7 +3495,7 @@ <h3>3.2. <a name="XML/A_provider">XML/A provider</a></h3>
 olap4j, in a Java package <code>org.olap4j.driver.xmla</code>, but is not part 
 of the olap4j specification or release.</p>
 
-<h2>4. <a name="Non-functionality">Non-functionality</a></h2>
+<h2>5. <a name="Non-functionality">Non-functionality</a></h2>
 
 <p>Here are some of the areas of functionality which will <i>not</i> be part of
 olap4j:</p>
@@ -3403,9 +3509,9 @@ <h2>4. <a name="Non-functionality">Non-functionality</a></h2>
   <li>SchemaReader</li>
 </ul>
 
-<h2>5. <a name="Related_projects">Related projects</a></h2>
+<h2>6. <a name="Related_projects">Related projects</a></h2>
 
-<h3>5.1. <a name="Mondrian_provider">Mondrian provider</a></h3>
+<h3>6.1. <a name="Mondrian_provider">Mondrian provider</a></h3>
 
 <p>The Mondrian project will contain an implementation of the olap4j API based on
 the Mondrian OLAP engine.</p>
@@ -3415,14 +3521,14 @@ <h3>5.1. <a name="Mondrian_provider">Mondrian provider</a></h3>
 will become mondrian's primary API, and the mondrian team will take over the development 
 of the mondrian provider.</p>
 
-<h3>5.2. <a name="XMLA_provider">XML for Analysis provider</a></h3>
+<h3>6.2. <a name="XMLA_provider">XML for Analysis provider</a></h3>
 <p>We intend to create an a driver which implements the olap4j API on top of any 
 XML/A data source.</p>
 <p>This code is currently being developed in the same source-code repository as 
 olap4j, but will never be part of any olap4j release, and will be spun off as a 
 separate project before olap4j 1.0.</p>
 
-<h3>5.3. <a name="Other_data_sources">Other data sources</a></h3>
+<h3>6.3. <a name="Other_data_sources">Other data sources</a></h3>
 
 <p>In principle, providers could be created to other OLAP data sources. This
 would be particularly straightforward for servers which already have a native
diff --git a/doc/tasks.txt b/doc/tasks.txt
index 2565258..2f43949 100644
--- a/doc/tasks.txt
+++ b/doc/tasks.txt
@@ -16,22 +16,15 @@ Remember that other people may be editing this file, so avoid non-mergeable edit
 Specification
 -------------
 
-* D.1 add discussion of thread-safety 
-* D.1 add discussion of api for cancelling statements 
-* D.1 add discussion of compliance levels 
 * D.1 describe how members of axis can be accessed via iterator or list, with code examples 
-* 2.1.5 internationalization: move section elsewhere; what is the behavior of locale? does it belong to connection? fix and test Query.getLocale(). document that all methods which return localized strings take a locale parameter; that parameter may be null, in which case the connection's locale is used 
-* 2.7.2 diagram of object model 
 * 2.8 query model - barry and/or james complete?
 * 2.9 layout - remove from spec? 
 * add mdx parser and mdx parse tree model to specification 
-* discuss access-control (each provider can have their own rules. can set access-control on the connection. metadata methods should be consistent with that.) 
 
 Javadoc
 -------
 
 * remove class OlapTest
-* ensure that every public method has a javadoc description, including @param, @return and @throws declarations 
 
 Code
 ----
diff --git a/src/mondrian/olap4j/Factory.java b/src/mondrian/olap4j/Factory.java
index b5dcc55..169f6e6 100644
--- a/src/mondrian/olap4j/Factory.java
+++ b/src/mondrian/olap4j/Factory.java
@@ -10,6 +10,7 @@
 package mondrian.olap4j;
 
 import mondrian.olap.Result;
+import mondrian.olap.Query;
 
 import java.util.Properties;
 import java.util.List;
@@ -39,7 +40,7 @@ ResultSet newFixedResultSet(
 
     MondrianOlap4jCellSet newCellSet(
         MondrianOlap4jStatement olap4jStatement,
-        Result result);
+        Query query);
 
     MondrianOlap4jPreparedStatement newPreparedStatement(
         String mdx, MondrianOlap4jConnection olap4jConnection);
diff --git a/src/mondrian/olap4j/FactoryJdbc3Impl.java b/src/mondrian/olap4j/FactoryJdbc3Impl.java
index 1440669..b24cab4 100644
--- a/src/mondrian/olap4j/FactoryJdbc3Impl.java
+++ b/src/mondrian/olap4j/FactoryJdbc3Impl.java
@@ -9,7 +9,7 @@
 */
 package mondrian.olap4j;
 
-import mondrian.olap.Result;
+import mondrian.olap.Query;
 
 import java.sql.*;
 import java.util.*;
@@ -50,9 +50,9 @@ public ResultSet newFixedResultSet(
 
     public MondrianOlap4jCellSet newCellSet(
         MondrianOlap4jStatement olap4jStatement,
-        Result result)
+        Query query)
     {
-        return new MondrianOlap4jCellSetJdbc3(olap4jStatement, result);
+        return new MondrianOlap4jCellSetJdbc3(olap4jStatement, query);
     }
 
     public MondrianOlap4jPreparedStatement newPreparedStatement(
@@ -84,10 +84,9 @@ private static class MondrianOlap4jCellSetJdbc3
         extends MondrianOlap4jCellSet
     {
         public MondrianOlap4jCellSetJdbc3(
-            MondrianOlap4jStatement olap4jStatement,
-            Result result)
+            MondrianOlap4jStatement olap4jStatement, Query query)
         {
-            super(olap4jStatement, result);
+            super(olap4jStatement);
         }
     }
 
diff --git a/src/mondrian/olap4j/FactoryJdbc4Impl.java b/src/mondrian/olap4j/FactoryJdbc4Impl.java
index 0d24c18..842e9fa 100644
--- a/src/mondrian/olap4j/FactoryJdbc4Impl.java
+++ b/src/mondrian/olap4j/FactoryJdbc4Impl.java
@@ -17,6 +17,7 @@
 import java.io.InputStream;
 
 import mondrian.olap.Result;
+import mondrian.olap.Query;
 
 /**
  * Implementation of {@link Factory} for JDBC 4.0.
@@ -54,9 +55,9 @@ public ResultSet newFixedResultSet(
 
     public MondrianOlap4jCellSet newCellSet(
         MondrianOlap4jStatement olap4jStatement,
-        Result result)
+        Query query)
     {
-        return new MondrianOlap4jCellSetJdbc4(olap4jStatement, result);
+        return new MondrianOlap4jCellSetJdbc4(olap4jStatement, query);
     }
 
     public MondrianOlap4jPreparedStatement newPreparedStatement(
@@ -381,9 +382,9 @@ public Struct createStruct(
     private static class MondrianOlap4jCellSetJdbc4 extends MondrianOlap4jCellSet {
         public MondrianOlap4jCellSetJdbc4(
             MondrianOlap4jStatement olap4jStatement,
-            Result result)
+            Query query)
         {
-            super(olap4jStatement, result);
+            super(olap4jStatement, query);
         }
 
         // implement java.sql.CellSet methods
diff --git a/src/mondrian/olap4j/MondrianOlap4jCell.java b/src/mondrian/olap4j/MondrianOlap4jCell.java
index 394f972..849b451 100644
--- a/src/mondrian/olap4j/MondrianOlap4jCell.java
+++ b/src/mondrian/olap4j/MondrianOlap4jCell.java
@@ -14,9 +14,10 @@
 import org.olap4j.OlapException;
 import org.olap4j.metadata.Property;
 
+import javax.sql.DataSource;
 import java.util.List;
 import java.util.ArrayList;
-import java.sql.ResultSet;
+import java.sql.*;
 
 /**
  * Implementation of {@link Cell}
@@ -55,8 +56,8 @@ public int getOrdinal() {
 
     public List<Integer> getCoordinateList() {
         ArrayList<Integer> list = new ArrayList<Integer>(coordinates.length);
-        for (int i = 0; i < coordinates.length; i++) {
-            list.add(coordinates[i]);
+        for (int coordinate : coordinates) {
+            list.add(coordinate);
         }
         return list;
     }
@@ -107,8 +108,26 @@ public String getFormattedValue() {
         return cell.getFormattedValue();
     }
 
-    public ResultSet drillThrough() {
-        throw new UnsupportedOperationException();
+    public ResultSet drillThrough() throws OlapException {
+        // REVIEW: This method returns a ResultSet without closing the
+        // Statement or the Connection. If we closed them, the ResultSet would
+        // be useless. But as it stands, we have a connection leak. Should we
+        // tell the client that they need to close the result set's connection?
+        if (!cell.canDrillThrough()) {
+            return null;
+        }
+        final String sql = cell.getDrillThroughSQL(false);
+        final MondrianOlap4jConnection olap4jConnection =
+            this.olap4jCellSet.olap4jStatement.olap4jConnection;
+        final DataSource dataSource =
+            olap4jConnection.connection.getDataSource();
+        try {
+            final Connection connection = dataSource.getConnection();
+            final Statement statement = connection.createStatement();
+            return statement.executeQuery(sql);
+        } catch (SQLException e) {
+            throw olap4jConnection.helper.toOlapException(e);
+        }
     }
 }
 
diff --git a/src/mondrian/olap4j/MondrianOlap4jCellSet.java b/src/mondrian/olap4j/MondrianOlap4jCellSet.java
index 4e64ae3..6d2df09 100644
--- a/src/mondrian/olap4j/MondrianOlap4jCellSet.java
+++ b/src/mondrian/olap4j/MondrianOlap4jCellSet.java
@@ -11,6 +11,7 @@
 
 import org.olap4j.*;
 import org.olap4j.Cell;
+import org.olap4j.Position;
 import mondrian.olap.*;
 import mondrian.olap.Axis;
 
@@ -32,51 +33,75 @@
  */
 abstract class MondrianOlap4jCellSet implements CellSet {
     final MondrianOlap4jStatement olap4jStatement;
-    private final Result result;
+    final Query query;
+    private Result result;
     protected boolean closed;
     private final MondrianOlap4jCellSetMetaData metaData;
+    private final List<CellSetAxis> axisList =
+        new ArrayList<CellSetAxis>();
+    private CellSetAxis filterAxis;
 
     public MondrianOlap4jCellSet(
         MondrianOlap4jStatement olap4jStatement,
-        Result result)
+        Query query)
     {
         assert olap4jStatement != null;
-        assert result != null;
+        assert query != null;
         this.olap4jStatement = olap4jStatement;
-        this.result = result;
+        this.query = query;
         this.closed = false;
         if (olap4jStatement instanceof MondrianOlap4jPreparedStatement) {
             this.metaData =
-                ((MondrianOlap4jPreparedStatement) olap4jStatement).cellSetMetaData;
+                ((MondrianOlap4jPreparedStatement) olap4jStatement)
+                    .cellSetMetaData;
         } else {
             this.metaData =
                 new MondrianOlap4jCellSetMetaData(
-                    olap4jStatement, result.getQuery());
+                    olap4jStatement, query);
         }
     }
 
-    public CellSetMetaData getMetaData() throws OlapException {
-        return metaData;
-    }
+    /**
+     * Executes a query. Not part of the olap4j API; internal to the mondrian
+     * driver.
+     *
+     * <p>This method may take some time. While it is executing, a client may
+     * execute {@link MondrianOlap4jStatement#cancel()}.
+     */
+    void execute() {
+        query.setQueryTimeoutMillis(olap4jStatement.timeoutSeconds * 1000);
+        result = olap4jStatement.olap4jConnection.connection.execute(query);
 
-    public List<CellSetAxis> getAxes() {
+        // initialize axes
         mondrian.olap.Axis[] axes = result.getAxes();
         QueryAxis[] queryAxes = result.getQuery().getAxes();
         assert axes.length == queryAxes.length;
-        ArrayList<CellSetAxis> list = new ArrayList<CellSetAxis>(axes.length);
-
         for (int i = 0; i < axes.length; i++) {
             Axis axis = axes[i];
             QueryAxis queryAxis = queryAxes[i];
-            list.add(new MondrianOlap4jCellSetAxis(this, queryAxis, axis));
+            axisList.add(new MondrianOlap4jCellSetAxis(this, queryAxis, axis));
+        }
+
+        // initialize filter axis
+        final QueryAxis queryAxis = result.getQuery().getSlicerAxis();
+        final Axis axis = result.getSlicerAxis();
+        if (queryAxis == null) {
+            filterAxis = null;
+        } else {
+            filterAxis = new MondrianOlap4jCellSetAxis(this, queryAxis, axis);
         }
-        return list;
+    }
+
+    public CellSetMetaData getMetaData() {
+        return metaData;
+    }
+
+    public List<CellSetAxis> getAxes() {
+        return axisList;
     }
 
     public CellSetAxis getFilterAxis() {
-        final Axis axis = result.getSlicerAxis();
-        final QueryAxis queryAxis = result.getQuery().getSlicerAxis();
-        return new MondrianOlap4jCellSetAxis(this, queryAxis, axis);
+        return filterAxis;
     }
 
     public Cell getCell(List<Integer> coordinates) {
@@ -84,8 +109,7 @@ public Cell getCell(List<Integer> coordinates) {
         for (int i = 0; i < coords.length; i++) {
             coords[i] = coordinates.get(i);
         }
-        mondrian.olap.Cell cell = result.getCell(coords);
-        return new MondrianOlap4jCell(coords, this, cell);
+        return getCellInternal(coords);
     }
 
     public Cell getCell(int ordinal) {
@@ -97,10 +121,64 @@ public Cell getCell(int ordinal) {
             modulo *= axes[i].getPositions().size();
             pos[i] = (ordinal % modulo) / prevModulo;
         }
-        mondrian.olap.Cell cell = result.getCell(pos);
+        if (ordinal < 0 || ordinal >= modulo) {
+            throw new IndexOutOfBoundsException(
+                "Cell ordinal " + ordinal
+                    + ") lies outside CellSet bounds ("
+                    + getBoundsAsString() + ")");
+        }
+        return getCellInternal(pos);
+    }
+
+    public Cell getCell(Position... positions) {
+        int[] coords = new int[positions.length];
+        for (int i = 0; i < coords.length; i++) {
+            coords[i] = positions[i].getOrdinal();
+        }
+        return getCellInternal(coords);
+    }
+
+    private Cell getCellInternal(int[] pos) {
+        mondrian.olap.Cell cell;
+        try {
+            cell = result.getCell(pos);
+        } catch (MondrianException e) {
+            if (e.getMessage().indexOf("coordinates out of range") >= 0) {
+                throw new IndexOutOfBoundsException(
+                    "Cell coordinates (" + getCoordsAsString(pos)
+                        + ") fall outside CellSet bounds ("
+                        + getCoordsAsString(pos) + ")");
+            } else {
+                throw e;
+            }
+        }
         return new MondrianOlap4jCell(pos, this, cell);
     }
 
+    private String getBoundsAsString() {
+        StringBuffer buf = new StringBuffer();
+        Axis[] axes = result.getAxes();
+        for (int i = 0; i < axes.length; i++) {
+            if (i > 0) {
+                buf.append(", ");
+            }
+            buf.append(axes[i].getPositions().size());
+        }
+        return buf.toString();
+    }
+
+    private static String getCoordsAsString(int[] pos) {
+        StringBuffer buf = new StringBuffer();
+        for (int i = 0; i < pos.length; i++) {
+            int po = pos[i];
+            if (i > 0) {
+                buf.append(", ");
+            }
+            buf.append(po);
+        }
+        return buf.toString();
+    }
+
     public List<Integer> ordinalToCoordinates(int ordinal) {
         throw new UnsupportedOperationException();
     }
diff --git a/src/mondrian/olap4j/MondrianOlap4jCellSetAxis.java b/src/mondrian/olap4j/MondrianOlap4jCellSetAxis.java
index deaa226..26844bc 100644
--- a/src/mondrian/olap4j/MondrianOlap4jCellSetAxis.java
+++ b/src/mondrian/olap4j/MondrianOlap4jCellSetAxis.java
@@ -14,6 +14,8 @@
 
 import java.util.*;
 
+import mondrian.olap.AxisOrdinal;
+
 /**
  * Implementation of {@link org.olap4j.CellSetAxis}
  * for the Mondrian OLAP engine.
@@ -22,7 +24,7 @@
  * @version $Id$
  * @since May 24, 2007
  */
-class MondrianOlap4jCellSetAxis implements CellSetAxis, CellSetAxisMetaData {
+class MondrianOlap4jCellSetAxis implements CellSetAxis {
     private final MondrianOlap4jCellSet olap4jCellSet;
     private final mondrian.olap.QueryAxis queryAxis;
     private final mondrian.olap.Axis axis;
@@ -40,8 +42,13 @@ class MondrianOlap4jCellSetAxis implements CellSetAxis, CellSetAxisMetaData {
         this.axis = axis;
     }
 
-    public int getOrdinal() {
-        return queryAxis.getAxisOrdinal().logicalOrdinal();
+    public Axis getAxisOrdinal() {
+        switch (queryAxis.getAxisOrdinal()) {
+        case SLICER:
+            return Axis.FILTER;
+        default:
+            return Axis.valueOf(queryAxis.getAxisOrdinal().name());
+        }
     }
 
     public CellSet getCellSet() {
@@ -49,7 +56,14 @@ public CellSet getCellSet() {
     }
 
     public CellSetAxisMetaData getAxisMetaData() {
-        throw new UnsupportedOperationException();
+        final AxisOrdinal axisOrdinal = queryAxis.getAxisOrdinal();
+        switch (axisOrdinal) {
+        case SLICER:
+            return olap4jCellSet.getMetaData().getFilterAxisMetaData();
+        default:
+            return olap4jCellSet.getMetaData().getAxesMetaData().get(
+                axisOrdinal.logicalOrdinal());
+        }
     }
 
     public List<Position> getPositions() {
@@ -67,25 +81,11 @@ public int size() {
     }
 
     public int getPositionCount() {
-        throw new UnsupportedOperationException();
-    }
-
-    public ListIterator<Position> iterate() {
-        throw new UnsupportedOperationException();
-    }
-
-    // implement CellSetAxisMetaData
-
-    public org.olap4j.Axis getAxis() {
-        throw new UnsupportedOperationException();
-    }
-
-    public List<Hierarchy> getHierarchies() {
-        throw new UnsupportedOperationException();
+        return getPositions().size();
     }
 
-    public NamedList<Property> getProperties() {
-        throw new UnsupportedOperationException();
+    public ListIterator<Position> iterator() {
+        return getPositions().listIterator();
     }
 
     private class MondrianOlap4jPosition implements Position {
diff --git a/src/mondrian/olap4j/MondrianOlap4jCellSetAxisMetaData.java b/src/mondrian/olap4j/MondrianOlap4jCellSetAxisMetaData.java
new file mode 100644
index 0000000..0a15d28
--- /dev/null
+++ b/src/mondrian/olap4j/MondrianOlap4jCellSetAxisMetaData.java
@@ -0,0 +1,101 @@
+/*
+// This software is subject to the terms of the Common Public License
+// Agreement, available at the following URL:
+// http://www.opensource.org/licenses/cpl.html.
+// Copyright (C) 2007-2007 Julian Hyde
+// All Rights Reserved.
+// You must accept the terms of that agreement to use this software.
+*/
+package mondrian.olap4j;
+
+import org.olap4j.CellSetAxisMetaData;
+import org.olap4j.Axis;
+import org.olap4j.metadata.*;
+import org.olap4j.metadata.Hierarchy;
+import org.olap4j.metadata.Property;
+import mondrian.olap.*;
+import mondrian.olap.type.*;
+
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * Implementation of {@link org.olap4j.CellSetMetaData}
+ * for the Mondrian OLAP engine.
+ *
+ * @author jhyde
+ * @version $Id: $
+* @since Nov 17, 2007
+*/
+class MondrianOlap4jCellSetAxisMetaData implements CellSetAxisMetaData {
+    private final QueryAxis queryAxis;
+    private final MondrianOlap4jConnection olap4jConnection;
+    private final NamedList<Property> propertyList =
+        new ArrayNamedListImpl<Property>() {
+            protected String getName(Property property) {
+                return property.getName();
+            }
+        };
+
+    MondrianOlap4jCellSetAxisMetaData(
+        MondrianOlap4jConnection olap4jConnection,
+        QueryAxis queryAxis)
+    {
+        if (queryAxis == null) {
+            queryAxis = new QueryAxis(
+                false, null, AxisOrdinal.SLICER,
+                QueryAxis.SubtotalVisibility.Undefined);
+        }
+        this.queryAxis = queryAxis;
+        this.olap4jConnection = olap4jConnection;
+
+        // populate property list
+        for (Id id : queryAxis.getDimensionProperties()) {
+            propertyList.add(
+                Property.StandardMemberProperty.valueOf(
+                    id.toStringArray()[0]));
+        }
+    }
+
+    public Axis getAxisOrdinal() {
+        switch (queryAxis.getAxisOrdinal()) {
+        case SLICER:
+            return Axis.FILTER;
+        default:
+            return Axis.valueOf(queryAxis.getAxisOrdinal().name());
+        }
+    }
+
+    public List<Hierarchy> getHierarchies() {
+        final Type type;
+        switch (queryAxis.getAxisOrdinal()) {
+        case SLICER:
+            type = queryAxis.getSet().getType();
+            break;
+        default:
+            final SetType setType =
+                (SetType) queryAxis.getSet().getType();
+            type = setType.getElementType();
+        }
+        List<Hierarchy> hierarchyList =
+            new ArrayList<Hierarchy>();
+        if (type instanceof TupleType) {
+            final TupleType tupleType = (TupleType) type;
+            for (Type elementType : tupleType.elementTypes) {
+                hierarchyList.add(
+                    olap4jConnection.toOlap4j(
+                        elementType.getHierarchy()));
+            }
+        } else {
+            hierarchyList.add(
+                olap4jConnection.toOlap4j(type.getHierarchy()));
+        }
+        return hierarchyList;
+    }
+
+    public NamedList<Property> getProperties() {
+        return propertyList;
+    }
+}
+
+// End MondrianOlap4jCellSetAxisMetaData.java
diff --git a/src/mondrian/olap4j/MondrianOlap4jCellSetMetaData.java b/src/mondrian/olap4j/MondrianOlap4jCellSetMetaData.java
index c9fdba2..443b910 100644
--- a/src/mondrian/olap4j/MondrianOlap4jCellSetMetaData.java
+++ b/src/mondrian/olap4j/MondrianOlap4jCellSetMetaData.java
@@ -11,13 +11,10 @@
 
 import mondrian.olap.Query;
 import mondrian.olap.QueryAxis;
-import mondrian.olap.type.*;
 import org.olap4j.*;
 import org.olap4j.metadata.*;
 
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Implementation of {@link org.olap4j.CellSetMetaData}
@@ -30,6 +27,13 @@
 class MondrianOlap4jCellSetMetaData implements CellSetMetaData {
     private final MondrianOlap4jStatement olap4jStatement;
     private final Query query;
+    private final NamedList<CellSetAxisMetaData> axesMetaData =
+        new ArrayNamedListImpl<CellSetAxisMetaData>() {
+            protected String getName(CellSetAxisMetaData axisMetaData) {
+                return axisMetaData.getAxisOrdinal().name();
+            }
+        };
+    private final MondrianOlap4jCellSetAxisMetaData filterAxisMetaData;
 
     MondrianOlap4jCellSetMetaData(
         MondrianOlap4jStatement olap4jStatement,
@@ -37,12 +41,36 @@ class MondrianOlap4jCellSetMetaData implements CellSetMetaData {
     {
         this.olap4jStatement = olap4jStatement;
         this.query = query;
+
+        final MondrianOlap4jConnection olap4jConnection =
+            olap4jStatement.olap4jConnection;
+        for (final QueryAxis queryAxis : query.getAxes()) {
+            axesMetaData.add(
+                new MondrianOlap4jCellSetAxisMetaData(
+                    olap4jConnection, queryAxis));
+        }
+        filterAxisMetaData =
+            new MondrianOlap4jCellSetAxisMetaData(
+                olap4jConnection, query.getSlicerAxis());
     }
 
     // implement CellSetMetaData
 
     public NamedList<Property> getCellProperties() {
-        throw new UnsupportedOperationException();
+        final ArrayNamedListImpl<Property> list =
+            new ArrayNamedListImpl<Property>() {
+                protected String getName(Property property) {
+                    return property.getName();
+                }
+            };
+        for (Property.StandardCellProperty property :
+            Property.StandardCellProperty.values())
+        {
+            if (query.hasCellProperty(property.getName())) {
+                list.add(property);
+            }
+        }
+        return list;
     }
 
     public Cube getCube() {
@@ -50,48 +78,11 @@ public Cube getCube() {
     }
 
     public NamedList<CellSetAxisMetaData> getAxesMetaData() {
-        final NamedList<CellSetAxisMetaData> list =
-            new ArrayNamedListImpl<CellSetAxisMetaData>() {
-                protected String getName(CellSetAxisMetaData axisMetaData) {
-                    return axisMetaData.getAxis().name();
-                }
-            };
-        final MondrianOlap4jConnection olap4jConnection =
-            olap4jStatement.olap4jConnection;
-        for (final QueryAxis queryAxis : query.getAxes()) {
-            list.add(
-                new CellSetAxisMetaData() {
-                    public Axis getAxis() {
-                        return Axis.valueOf(queryAxis.getAxisOrdinal().name());
-                    }
-
-                    public List<Hierarchy> getHierarchies() {
-                        final SetType setType =
-                            (SetType) queryAxis.getSet().getType();
-                        final Type type = setType.getElementType();
-                        List<Hierarchy> hierarchyList =
-                            new ArrayList<Hierarchy>();
-                        if (type instanceof TupleType) {
-                            final TupleType tupleType = (TupleType) type;
-                            for (Type elementType : tupleType.elementTypes) {
-                                hierarchyList.add(
-                                    olap4jConnection.toOlap4j(
-                                        elementType.getHierarchy()));
-                            }
-                        } else {
-                            hierarchyList.add(
-                                olap4jConnection.toOlap4j(type.getHierarchy()));
-                        }
-                        return hierarchyList;
-                    }
-
-                    public NamedList<Property> getProperties() {
-                        throw new UnsupportedOperationException();
-                    }
-                }
-            );
-        }
-        return list;
+        return axesMetaData;
+    }
+
+    public CellSetAxisMetaData getFilterAxisMetaData() {
+        return filterAxisMetaData;
     }
 
     // implement ResultSetMetaData
@@ -183,18 +174,17 @@ public String getColumnClassName(int column) throws SQLException {
     // implement Wrapper
 
     public <T> T unwrap(Class<T> iface) throws SQLException {
-        if (false) {
-            return null;
+        if (iface.isInstance(this)) {
+            return iface.cast(this);
         }
-        throw new UnsupportedOperationException();
+        throw this.olap4jStatement.olap4jConnection.helper.createException(
+            "does not implement '" + iface + "'");
     }
 
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
-        if (false) {
-            return false;
-        }
-        throw new UnsupportedOperationException();
+        return iface.isInstance(this);
     }
+
 }
 
 // End MondrianOlap4jCellSetMetaData.java
diff --git a/src/mondrian/olap4j/MondrianOlap4jConnection.java b/src/mondrian/olap4j/MondrianOlap4jConnection.java
index 240728f..67b8f12 100644
--- a/src/mondrian/olap4j/MondrianOlap4jConnection.java
+++ b/src/mondrian/olap4j/MondrianOlap4jConnection.java
@@ -66,6 +66,7 @@ abstract class MondrianOlap4jConnection implements OlapConnection {
     private static final String CONNECT_STRING_PREFIX = "jdbc:mondrian:";
 
     final Factory factory;
+    private Locale locale;
 
     /**
      * Creates an Olap4j connection to Mondrian.
@@ -473,6 +474,20 @@ SelectNode toOlap4j(Query query) {
         return new MondrianToOlap4jNodeConverter(this).toOlap4j(query);
     }
 
+    public void setLocale(Locale locale) {
+        if (locale == null) {
+            throw new IllegalArgumentException("locale must not be null");
+        }
+        this.locale = locale;
+    }
+
+    public Locale getLocale() {
+        if (locale == null) {
+            return Locale.getDefault();
+        }
+        return locale;
+    }
+
     // inner classes
 
     /**
@@ -556,6 +571,13 @@ public SelectNode validateSelect(SelectNode selectNode) throws OlapException {
         }
     }
 
+    static Axis toOlap4j(String axisName) {
+        if (axisName.equals("SLICER")) {
+            axisName = "FILTER";
+        }
+        return Axis.valueOf(axisName);
+    }
+
     private static class MondrianToOlap4jNodeConverter {
         private final MondrianOlap4jConnection olap4jConnection;
 
@@ -585,7 +607,7 @@ private AxisNode toOlap4j(QueryAxis axis) {
                 null,
                 axis.isNonEmpty(),
                 toOlap4j(axis.getSet()),
-                Axis.valueOf(axis.getAxisName()),
+                MondrianOlap4jConnection.toOlap4j(axis.getAxisName()),
                 toOlap4j(axis.getDimensionProperties()));
         }
 
diff --git a/src/mondrian/olap4j/MondrianOlap4jStatement.java b/src/mondrian/olap4j/MondrianOlap4jStatement.java
index 434f517..2152d8c 100644
--- a/src/mondrian/olap4j/MondrianOlap4jStatement.java
+++ b/src/mondrian/olap4j/MondrianOlap4jStatement.java
@@ -21,7 +21,6 @@
 import java.io.PrintWriter;
 
 import mondrian.olap.Query;
-import mondrian.olap.Result;
 
 /**
  * Implementation of {@link org.olap4j.OlapStatement}
@@ -34,7 +33,14 @@
 class MondrianOlap4jStatement implements OlapStatement {
     final MondrianOlap4jConnection olap4jConnection;
     private boolean closed;
+
+    /**
+     * Current cell set, or null if the statement is not executing anything.
+     * Any method which modifies this member must synchronize
+     * on the MondrianOlap4jStatement.
+     */
     MondrianOlap4jCellSet openCellSet;
+    int timeoutSeconds;
 
     MondrianOlap4jStatement(
         MondrianOlap4jConnection olap4jConnection)
@@ -60,7 +66,7 @@ public int executeUpdate(String sql) throws SQLException {
         throw new UnsupportedOperationException();
     }
 
-    public void close() throws SQLException {
+    public synchronized void close() throws SQLException {
         if (!closed) {
             closed = true;
             if (openCellSet != null) {
@@ -92,15 +98,21 @@ public void setEscapeProcessing(boolean enable) throws SQLException {
     }
 
     public int getQueryTimeout() throws SQLException {
-        throw new UnsupportedOperationException();
+        return timeoutSeconds;
     }
 
     public void setQueryTimeout(int seconds) throws SQLException {
-        throw new UnsupportedOperationException();
+        if (seconds < 0) {
+            throw olap4jConnection.helper.createException(
+                "illegal timeout value " + seconds);
+        }
+        this.timeoutSeconds = seconds;
     }
 
-    public void cancel() throws SQLException {
-        throw new UnsupportedOperationException();
+    public synchronized void cancel() throws SQLException {
+        if (openCellSet != null) {
+            openCellSet.query.cancel();
+        }
     }
 
     public SQLWarning getWarnings() throws SQLException {
@@ -253,20 +265,27 @@ public CellSet executeOlapQuery(String mdx) throws OlapException {
      * @return Cell set
      * @throws OlapException if a database error occurs
      */
-    protected CellSet executeOlapQueryInternal(Query query) throws OlapException {
+    protected CellSet executeOlapQueryInternal(
+        Query query) throws OlapException
+    {
         // Close the previous open CellSet, if there is one.
-        if (openCellSet != null) {
-            final MondrianOlap4jCellSet cs = openCellSet;
-            openCellSet = null;
-            try {
-                cs.close();
-            } catch (SQLException e) {
-                throw olap4jConnection.helper.createException(
-                    null, "Error while closing previous CellSet", e);
+        synchronized (this) {
+            if (openCellSet != null) {
+                final MondrianOlap4jCellSet cs = openCellSet;
+                openCellSet = null;
+                try {
+                    cs.close();
+                } catch (SQLException e) {
+                    throw olap4jConnection.helper.createException(
+                        null, "Error while closing previous CellSet", e);
+                }
             }
+
+            openCellSet = olap4jConnection.factory.newCellSet(this, query);
         }
-        Result result = olap4jConnection.connection.execute(query);
-        openCellSet = olap4jConnection.factory.newCellSet(this, result);
+        // Release the monitor before executing, to give another thread the
+        // opportunity to call cancel.
+        openCellSet.execute();
         return openCellSet;
     }
 
diff --git a/src/org/olap4j/Axis.java b/src/org/olap4j/Axis.java
index 1dfe54f..7f1524e 100644
--- a/src/org/olap4j/Axis.java
+++ b/src/org/olap4j/Axis.java
@@ -14,7 +14,11 @@
 /**
  * Enumeration of axis types.
  *
- * <p>Typically used values are ROWS, COLUMNS, and SLICER.
+ * <p>The most commonly used values are
+ * <code>COLUMNS</code> (the first axis of a 2-dimensional query),
+ * <code>ROWS</code> (the second axis of a 2-dimensional query) and
+ * <code>FILTER</code> (also known as the slicer axis, denoted by a
+ * <code>WHERE</code> clause in an MDX statement).
  *
  * @author jhyde
  * @version $Id$
@@ -22,7 +26,7 @@
  */
 public enum Axis {
     UNUSED,
-    SLICER,
+    FILTER,
     COLUMNS,
     ROWS,
     PAGES,
@@ -36,7 +40,7 @@ public enum Axis {
      *
      * <p>The axis ordinal is two less than the {@link #ordinal} value which
      * every <code>enum</code> value possesses. Hence, {@link #UNUSED} is -2
-     * and {@link #SLICER} is -1 (because they are not treated the same as the
+     * and {@link #FILTER} is -1 (because they are not treated the same as the
      * other axes), {@link #COLUMNS} is 0, {@link #ROWS} is 1, and so forth.
      *
      * @return Axis ordinal
@@ -47,6 +51,9 @@ public int axisOrdinal() {
 
     /**
      * Returns localized name for this Axis.
+     *
+     * @param locale Locale for which to give the name
+     * @return localized name for this Axis
      */
     public String getCaption(Locale locale) {
         // todo: localize
@@ -55,6 +62,9 @@ public String getCaption(Locale locale) {
 
     /**
      * Returns the axis with a given {@link #axisOrdinal()}.
+     *
+     * @param axisOrdinal Axis ordinal
+     * @return Axis whose {@link #axisOrdinal()} is as given
      */
     public static Axis forOrdinal(int axisOrdinal) {
         Axis axis = values()[axisOrdinal + 2];
diff --git a/src/org/olap4j/Cell.java b/src/org/olap4j/Cell.java
index 30cc3a4..82e4f96 100755
--- a/src/org/olap4j/Cell.java
+++ b/src/org/olap4j/Cell.java
@@ -156,9 +156,11 @@ public interface Cell {
      * Drills through from this cell to the underlying fact table data,
      * and returns a {@link java.sql.ResultSet} of the results.
      *
+     * <p>If drill-through is not possible, returns null.
+     *
      * @return result set of the fact rows underlying this Cell
      */
-    ResultSet drillThrough();
+    ResultSet drillThrough() throws OlapException;
 }
 
 // End Cell.java
diff --git a/src/org/olap4j/CellSet.java b/src/org/olap4j/CellSet.java
index 9d8e903..2d3fa86 100755
--- a/src/org/olap4j/CellSet.java
+++ b/src/org/olap4j/CellSet.java
@@ -88,7 +88,11 @@ public interface CellSet extends ResultSet, OlapWrapper {
      * Returns the Cell at a given set of coordinates.
      *
      * @param coordinates List of 0-based coordinates of the cell
+     *
      * @return Cell
+     *
+     * @throws IndexOutOfBoundsException if coordinates are outside CellSet
+     * bounds
      */
     Cell getCell(List<Integer> coordinates);
 
@@ -102,10 +106,34 @@ public interface CellSet extends ResultSet, OlapWrapper {
      * </code></blockquote>
      *
      * @param ordinal 0-based ordinal of the cell
+     *
      * @return Cell
+     *
+     * @throws IndexOutOfBoundsException if ordinal lies outside CellSet bounds
      */
     Cell getCell(int ordinal);
 
+    /**
+     * Returns the Cell at the intersection of a set of axis positions.
+     *
+     * <p>Equivalent to
+     *
+     * <blockquote><pre><code>
+     * getCell(
+     *     Arrays.asList(
+     *         positions[0].ordinal(),
+     *         positions[1].ordinal() [, ...]))
+     * </code></pre></blockquote>
+     *
+     * @param positions Array of positions
+     *
+     * @return Cell
+     *
+     * @throws IndexOutOfBoundsException if positions lie outside CellSet
+     * bounds
+     */
+    Cell getCell(Position... positions);
+
     /**
      * Converts a cell ordinal to a list of cell coordinates.
      *
diff --git a/src/org/olap4j/CellSetAxis.java b/src/org/olap4j/CellSetAxis.java
index d67f25d..75ee422 100755
--- a/src/org/olap4j/CellSetAxis.java
+++ b/src/org/olap4j/CellSetAxis.java
@@ -25,23 +25,24 @@
  *
  * <p>The positions on the cell set axis can be accessed sequentially or
  * random-access. Use the {@link #getPositions()} method to return a list for
- * random access, or the {@link #iterate()} method to obtain an iterator for
+ * random access, or the {@link #iterator()} method to obtain an iterator for
  * sequential access.
  *
  * @author jhyde
  * @version $Id$
  * @since Aug 22, 2006
  */
-public interface CellSetAxis {
+public interface CellSetAxis extends Iterable<Position> {
     /**
-     * Returns the ordinal of this <code>CellSetAxis</code>.
+     * Returns the axis ordinal of this <code>CellSetAxis</code>.
      *
-     * <p>0 = ROWS, 1 = COLUMNS, and so forth, as described by the
+     * <p>The first axis in a CellSet will return {@link Axis#COLUMNS},
+     * the second {@link Axis#ROWS}, and so forth, as described by the
      * {@link Axis#axisOrdinal()} method of the {@link Axis} enumeration.</p>
      *
      * @return the ordinal of this axis
      */
-    int getOrdinal();
+    Axis getAxisOrdinal();
 
     /**
      * Returns the {@link CellSet} which this <code>CellSetAxis</code>
@@ -57,10 +58,13 @@ public interface CellSetAxis {
      *
      * <p>The result is identical to evaluating
      * <blockquote>
-     * <code>
-     * getCellSet().getMetaData().getAxesMetaData(getOrdinal())
-     * </code>
+     * <code>getCellSet().getMetaData().getSlicerAxisMetaData()</code>
      * </blockquote>
+     * for a filter axis, and
+     * <blockquote>
+     * <code>getCellSet().getMetaData().getAxesMetaData().get(getAxisOrdinal().axisOrdinal())</code>
+     * </blockquote>
+     * for other axes.
      *
      * @return metadata describing this CellSetAxis
      */
@@ -90,9 +94,25 @@ public interface CellSetAxis {
     /**
      * Opens an iterator over the positions on this CellSetAxis.
      *
+     * <p>If this axis has very many positions, this method may be more
+     * efficient than {@link #getPositions()}.
+     *
+     * <p>This method allows CellSetAxis to implement the {@link Iterable}
+     * interface, so one might use it in a foreach construct, for example:
+     *
+     * <blockquote>
+     * <pre>
+     * CellSet cellSet;
+     * for (Position rowPos : cellSet.getAxes().get(0)) {
+     *     for (Position colPos : cellSet.getAxes().get(1)) {
+     *          Cell cell = cellSet.getCell(colPos, rowPos);
+     *          ....
+     *     }
+     * }</code></blockquote>
+     *
      * @return iterator over the collection of positions
      */
-    ListIterator<Position> iterate();
+    ListIterator<Position> iterator();
 
 }
 
diff --git a/src/org/olap4j/CellSetAxisMetaData.java b/src/org/olap4j/CellSetAxisMetaData.java
index 58203fa..e699b3a 100755
--- a/src/org/olap4j/CellSetAxisMetaData.java
+++ b/src/org/olap4j/CellSetAxisMetaData.java
@@ -54,18 +54,25 @@
  */
 public interface CellSetAxisMetaData {
     /**
-     * Returns the definition of the axis.
-     * ({@link Axis#SLICER}, {@link Axis#ROWS}, and so forth.)
+     * Returns the definition of the axis. Typical values are
+     * ({@link Axis#FILTER}, {@link Axis#COLUMNS}, {@link Axis#ROWS}, and so
+     * forth.)
+     *
+     * @return the Axis
      */
-    Axis getAxis();
+    Axis getAxisOrdinal();
 
     /**
      * Returns the hierarchies which are mapped onto this axis.
+     *
+     * @return list of hierarchies on this Axis
      */
     List<Hierarchy> getHierarchies();
 
     /**
      * Returns the member properties which are returned on this axis.
+     *
+     * @return list of member properties on this Axis
      */
     NamedList<Property> getProperties();
 }
diff --git a/src/org/olap4j/CellSetMetaData.java b/src/org/olap4j/CellSetMetaData.java
index ec5c9ed..f067ea6 100755
--- a/src/org/olap4j/CellSetMetaData.java
+++ b/src/org/olap4j/CellSetMetaData.java
@@ -12,7 +12,6 @@
 import org.olap4j.metadata.*;
 
 import java.sql.ResultSetMetaData;
-import java.util.List;
 
 /**
  * An object that can be used to get information about the axes
@@ -59,6 +58,15 @@ public interface CellSetMetaData extends ResultSetMetaData, OlapWrapper {
      * @return list of metadata describing each result axis
      */
     NamedList<CellSetAxisMetaData> getAxesMetaData();
+
+    /**
+     * Returns a CellSetAxisMetaData describing the filter axis. Never returns
+     * null; if the MDX statement contains no WHERE clause, the description of
+     * the filter contains no hierarchies.
+     *
+     * @return metadata describing filter axis
+     */
+    CellSetAxisMetaData getFilterAxisMetaData();
 }
 
 // End CellSetMetaData.java
diff --git a/src/org/olap4j/OlapConnection.java b/src/org/olap4j/OlapConnection.java
index 1191a00..07fd733 100644
--- a/src/org/olap4j/OlapConnection.java
+++ b/src/org/olap4j/OlapConnection.java
@@ -10,11 +10,10 @@
 package org.olap4j;
 
 import org.olap4j.mdx.parser.MdxParserFactory;
-import org.olap4j.metadata.Schema;
-import org.olap4j.metadata.Catalog;
-import org.olap4j.metadata.NamedList;
+import org.olap4j.metadata.*;
 
 import java.sql.Connection;
+import java.util.Locale;
 
 /**
  * Connection to an OLAP server.
@@ -78,6 +77,25 @@ public interface OlapConnection extends Connection, OlapWrapper {
      * @return List of Catalogs in this connection's OLAP server
      */
     NamedList<Catalog> getCatalogs();
+
+    /**
+     * Sets the current locale of this connection. The value must not be null.
+     * 
+     * <p>If the locale is not set, the JDK's current locale is used (see
+     * {@link java.util.Locale#getDefault()}).
+     *
+     * <p>Most drivers support a <code>Locale</code> connect-string property.
+     *
+     * @param locale Locale
+     */
+    void setLocale(Locale locale);
+
+    /**
+     * Returns this connection's locale. The value is never null.
+     *
+     * @return locale of this connection
+     */
+    Locale getLocale();
 }
 
 // End OlapConnection.java
diff --git a/src/org/olap4j/Position.java b/src/org/olap4j/Position.java
index 0c1f89b..bf12ada 100755
--- a/src/org/olap4j/Position.java
+++ b/src/org/olap4j/Position.java
@@ -106,6 +106,8 @@ public interface Position {
     /**
      * Returns the zero-based ordinal of this Position on its
      * {@link CellSetAxis}.
+     *
+     * @return ordinal of this Position
      */
     int getOrdinal();
 }
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java
index 7982fda..61b9ca0 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java
@@ -57,19 +57,23 @@ public CellSetMetaData getMetaData() throws OlapException {
         return metaData;
     }
 
+    public Cell getCell(List<Integer> coordinates) {
+        throw Util.needToImplement(this);
+    }
+
     public Cell getCell(int ordinal) {
         throw Util.needToImplement(this);
     }
 
-    public List<CellSetAxis> getAxes() {
+    public Cell getCell(Position... positions) {
         throw Util.needToImplement(this);
     }
 
-    public CellSetAxis getFilterAxis() {
+    public List<CellSetAxis> getAxes() {
         throw Util.needToImplement(this);
     }
 
-    public Cell getCell(List<Integer> coordinates) {
+    public CellSetAxis getFilterAxis() {
         throw Util.needToImplement(this);
     }
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java
index 400c262..a499fb4 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSetMetaData.java
@@ -47,7 +47,11 @@ public NamedList<CellSetAxisMetaData> getAxesMetaData() {
         throw Util.needToImplement(this);
     }
 
-    // implement ResultSetMetaData
+    public CellSetAxisMetaData getFilterAxisMetaData() {
+        throw Util.needToImplement(this);
+    }
+
+// implement ResultSetMetaData
 
     public int getColumnCount() throws SQLException {
         throw new UnsupportedOperationException();
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
index 5fa1fd0..1c39721 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
@@ -59,6 +59,8 @@ abstract class XmlaOlap4jConnection implements OlapConnection {
      */
     final URL serverUrl;
 
+    private Locale locale;
+
     /**
      * Creates an Olap4j connection an XML/A provider.
      *
@@ -342,7 +344,18 @@ String getURL() {
         throw Util.needToImplement(this);
     }
 
-    // inner classes
+    public void setLocale(Locale locale) {
+        this.locale = locale;
+    }
+
+    public Locale getLocale() {
+        if (locale == null) {
+            return Locale.getDefault();
+        }
+        return locale;
+    }
+
+    // ~ inner classes --------------------------------------------------------
 
     static class Helper {
         SQLException createException(String msg) {
diff --git a/src/org/olap4j/mdx/AxisNode.java b/src/org/olap4j/mdx/AxisNode.java
index b34b587..0e04594 100644
--- a/src/org/olap4j/mdx/AxisNode.java
+++ b/src/org/olap4j/mdx/AxisNode.java
@@ -33,6 +33,7 @@ public class AxisNode implements ParseTreeNode {
     /**
      * Creates an axis.
      *
+     * @param region Region of source code
      * @param nonEmpty Whether to filter out members of this axis whose cells
      *    are all empty
      * @param expression Expression to populate the axis
@@ -78,6 +79,8 @@ public Axis getAxis() {
 
     /**
      * Returns whether the axis has the <code>NON EMPTY</code> property set.
+     *
+     * @return whether the axis is NON EMPTY
      */
     public boolean isNonEmpty() {
         return nonEmpty;
@@ -87,6 +90,8 @@ public boolean isNonEmpty() {
      * Sets whether the axis has the <code>NON EMPTY</code> property set.
      *
      * See {@link #isNonEmpty()}.
+     *
+     * @param nonEmpty whether the axis is NON EMPTY
      */
     public void setNonEmpty(boolean nonEmpty) {
         this.nonEmpty = nonEmpty;
@@ -94,6 +99,8 @@ public void setNonEmpty(boolean nonEmpty) {
 
     /**
      * Returns the expression which is used to compute the value of this axis.
+     *
+     * @return the expression which is used to compute the value of this axis
      */
     public ParseTreeNode getExpression() {
         return expression;
@@ -102,6 +109,9 @@ public ParseTreeNode getExpression() {
     /**
      * Sets the expression which is used to compute the value of this axis.
      * See {@link #getExpression()}.
+     *
+     * @param expr the expression which is used to compute the value of this
+     * axis
      */
     public void setExpression(ParseTreeNode expr) {
         this.expression = expr;
@@ -125,7 +135,7 @@ public void unparse(ParseTreeWriter writer) {
                 dimensionProperty.unparse(writer);
             }
         }
-        if (axis != Axis.SLICER) {
+        if (axis != Axis.FILTER) {
             pw.print(" ON " + axis);
         }
     }
diff --git a/src/org/olap4j/mdx/DimensionNode.java b/src/org/olap4j/mdx/DimensionNode.java
index 90f96c7..f6e55bc 100644
--- a/src/org/olap4j/mdx/DimensionNode.java
+++ b/src/org/olap4j/mdx/DimensionNode.java
@@ -25,6 +25,12 @@ public class DimensionNode implements ParseTreeNode {
     private final ParseRegion region;
     private final Dimension dimension;
 
+    /**
+     * Creates a DimensionNode.
+     *
+     * @param region Region of source code
+     * @param dimension Dimension which is used in the expression
+     */
     public DimensionNode(
         ParseRegion region,
         Dimension dimension)
@@ -51,7 +57,7 @@ public <T> T accept(ParseTreeVisitor<T> visitor) {
     }
 
     public Type getType() {
-        return DimensionType.forDimension(dimension);
+        return new DimensionType(dimension);
     }
 
     public void unparse(ParseTreeWriter writer) {
diff --git a/src/org/olap4j/mdx/HierarchyNode.java b/src/org/olap4j/mdx/HierarchyNode.java
index 3f24aac..4bc2e5e 100644
--- a/src/org/olap4j/mdx/HierarchyNode.java
+++ b/src/org/olap4j/mdx/HierarchyNode.java
@@ -25,6 +25,12 @@ public class HierarchyNode implements ParseTreeNode {
     private final ParseRegion region;
     private final Hierarchy hierarchy;
 
+    /**
+     * Creates a HierarchyNode.
+     *
+     * @param region Region of source code
+     * @param hierarchy Hierarchy which is used in the expression
+     */
     public HierarchyNode(
         ParseRegion region,
         Hierarchy hierarchy)
diff --git a/src/org/olap4j/mdx/IdentifierNode.java b/src/org/olap4j/mdx/IdentifierNode.java
index 8c2b641..b549439 100644
--- a/src/org/olap4j/mdx/IdentifierNode.java
+++ b/src/org/olap4j/mdx/IdentifierNode.java
@@ -149,13 +149,14 @@ public String toString() {
      * </ul>
      */
     public static class Segment {
-        public final String name;
-        public final IdentifierNode.Quoting quoting;
+        final String name;
+        final IdentifierNode.Quoting quoting;
         private final ParseRegion region;
 
         /**
          * Creates a segment with the given quoting and region.
          *
+         * @param region Region of source code
          * @param name Name
          * @param quoting Quoting style
          */
@@ -181,12 +182,36 @@ public Segment(String name) {
         /**
          * Returns the region of the source code which this Segment was created
          * from, if it was created by parsing.
+         *
+         * @return region of source code
          */
         public ParseRegion getRegion() {
             return region;
         }
+
+        /**
+         * Returns the name of this Segment.
+         *
+         * @return name of this Segment
+         */
+        public String getName() {
+            return name;
+        }
+
+        /**
+         * Returns how this Segment is quoted.
+         *
+         * @return how this Segment is quoted
+         */
+        public Quoting getQuoting() {
+            return quoting;
+        }
     }
 
+    /**
+     * Enumeration of styles by which the component of an identifier can be
+     * quoted.
+     */
     public enum Quoting {
 
         /**
diff --git a/src/org/olap4j/mdx/LevelNode.java b/src/org/olap4j/mdx/LevelNode.java
index 01ef00f..0f43009 100644
--- a/src/org/olap4j/mdx/LevelNode.java
+++ b/src/org/olap4j/mdx/LevelNode.java
@@ -14,7 +14,7 @@
 import org.olap4j.type.LevelType;
 
 /**
- * Usage of a {@link org.olap4j.metadata.Member} as an expression in an MDX
+ * Usage of a {@link org.olap4j.metadata.Level} as an expression in an MDX
  * parse tree.
  *
  * @author jhyde
@@ -25,6 +25,12 @@ public class LevelNode implements ParseTreeNode {
     private final ParseRegion region;
     private final Level level;
 
+    /**
+     * Creates a LevelNode.
+     *
+     * @param region Region of source code
+     * @param level Level which is used in the expression
+     */
     public LevelNode(
         ParseRegion region,
         Level level)
diff --git a/src/org/olap4j/mdx/LiteralNode.java b/src/org/olap4j/mdx/LiteralNode.java
index 4317a66..909b885 100644
--- a/src/org/olap4j/mdx/LiteralNode.java
+++ b/src/org/olap4j/mdx/LiteralNode.java
@@ -36,7 +36,7 @@ public class LiteralNode implements ParseTreeNode {
      *
      * <p>Use the creation methods {@link #createString} etc.
      *
-     * @param region Region
+     * @param region Region of source code
      * @param type Type of this literal; must not be null
      * @param value Value of this literal, must be null only if this is the
      *   null literal
@@ -56,7 +56,7 @@ private LiteralNode(
     /**
      * Creates a literal with the NULL value.
      *
-     * @param region Region
+     * @param region Region of source code
      * @return literal representing the NULL value
      */
     public static LiteralNode createNull(ParseRegion region) {
@@ -66,50 +66,76 @@ public static LiteralNode createNull(ParseRegion region) {
     /**
      * Creates a string literal.
      *
+     * @param region Region of source code
+     * @param value String value
+     *
+     * @return literal representing the string value
+     *
      * @see #createSymbol
      */
     public static LiteralNode createString(
         ParseRegion region,
         String value)
     {
+        if (value == null) {
+            throw new IllegalArgumentException("value must not be null");
+        }
         return new LiteralNode(region, new StringType(), value);
     }
 
     /**
      * Creates a symbol literal.
      *
+     * @param region Region of source code
+     * @param value Name of symbol
+     *
+     * @return literal representing the symbol value
+     *
      * @see #createString
      */
     public static LiteralNode createSymbol(
         ParseRegion region,
         String value)
     {
+        if (value == null) {
+            throw new IllegalArgumentException("value must not be null");
+        }
         return new LiteralNode(region, new SymbolType(), value);
     }
 
     /**
      * Creates a floating-point numeric literal.
      *
+     * @param region Region of source code
      * @param value Value of literal; must not be null
+     *
+     * @return literal representing the floating-point value
      */
     public static LiteralNode create(
         ParseRegion region,
         Double value)
     {
-        assert value != null;
+        if (value == null) {
+            throw new IllegalArgumentException("value must not be null");
+        }
         return new LiteralNode(region, new NumericType(), value);
     }
 
     /**
      * Creates an integer literal.
      *
+     * @param region Region of source code
      * @param value Value of literal; must not be null
+     *
+     * @return literal representing the integer value
      */
     public static LiteralNode create(
         ParseRegion region,
         Integer value)
     {
-        assert value != null;
+        if (value == null) {
+            throw new IllegalArgumentException("value must not be null");
+        }
         return new LiteralNode(region, new NumericType(), value);
     }
 
diff --git a/src/org/olap4j/mdx/MemberNode.java b/src/org/olap4j/mdx/MemberNode.java
index ef8efda..ebe107c 100644
--- a/src/org/olap4j/mdx/MemberNode.java
+++ b/src/org/olap4j/mdx/MemberNode.java
@@ -25,6 +25,12 @@ public class MemberNode implements ParseTreeNode {
     private final ParseRegion region;
     private final Member member;
 
+    /**
+     * Creates a MemberNode.
+     *
+     * @param region Region of source code
+     * @param member Member which is used in the expression
+     */
     public MemberNode(
         ParseRegion region,
         Member member)
diff --git a/src/org/olap4j/mdx/ParseRegion.java b/src/org/olap4j/mdx/ParseRegion.java
index 3c5d960..96b0096 100644
--- a/src/org/olap4j/mdx/ParseRegion.java
+++ b/src/org/olap4j/mdx/ParseRegion.java
@@ -165,6 +165,9 @@ public boolean equals(Object obj) {
      * Combines this region with a list of parse tree nodes to create a
      * region which spans from the first point in the first to the last point
      * in the other.
+     *
+     * @param regions Collection of source code regions
+     * @return region which represents the span of the given regions
      */
     public ParseRegion plusAll(Iterable<ParseRegion> regions)
     {
@@ -179,6 +182,9 @@ public ParseRegion plusAll(Iterable<ParseRegion> regions)
     /**
      * Combines the parser positions of a list of nodes to create a position
      * which spans from the beginning of the first to the end of the last.
+     *
+     * @param nodes Collection of parse tree nodes
+     * @return region which represents the span of the given nodes
      */
     public static ParseRegion sum(
         Iterable<ParseRegion> nodes)
@@ -221,7 +227,7 @@ private static ParseRegion sum(
     }
 
     /**
-     * Looks for one or two carets in a SQL string, and if present, converts
+     * Looks for one or two carets in an MDX string, and if present, converts
      * them into a parser position.
      *
      * <p>Examples:
@@ -232,37 +238,40 @@ private static ParseRegion sum(
      * <li>findPos("xxx^yy^y") yields {"xxxyyy", position 3, line 4 column 4
      * through line 1 column 6}
      * </ul>
+     *
+     * @param code Source code
+     * @return object containing source code annotated with region
      */
-    public static RegionAndSource findPos(String sql)
+    public static RegionAndSource findPos(String code)
     {
-        int firstCaret = sql.indexOf('^');
+        int firstCaret = code.indexOf('^');
         if (firstCaret < 0) {
-            return new RegionAndSource(sql, null);
+            return new RegionAndSource(code, null);
         }
-        int secondCaret = sql.indexOf('^', firstCaret + 1);
+        int secondCaret = code.indexOf('^', firstCaret + 1);
         if (secondCaret < 0) {
-            String sqlSansCaret =
-                sql.substring(0, firstCaret)
-                + sql.substring(firstCaret + 1);
-            int [] start = indexToLineCol(sql, firstCaret);
+            String codeSansCaret =
+                code.substring(0, firstCaret)
+                + code.substring(firstCaret + 1);
+            int [] start = indexToLineCol(code, firstCaret);
             return new RegionAndSource(
-                sqlSansCaret,
+                codeSansCaret,
                 new ParseRegion(start[0], start[1]));
         } else {
-            String sqlSansCaret =
-                sql.substring(0, firstCaret)
-                + sql.substring(firstCaret + 1, secondCaret)
-                + sql.substring(secondCaret + 1);
-            int [] start = indexToLineCol(sql, firstCaret);
+            String codeSansCaret =
+                code.substring(0, firstCaret)
+                + code.substring(firstCaret + 1, secondCaret)
+                + code.substring(secondCaret + 1);
+            int [] start = indexToLineCol(code, firstCaret);
 
             // subtract 1 because first caret pushed the string out
             --secondCaret;
 
             // subtract 1 because the col position needs to be inclusive
             --secondCaret;
-            int [] end = indexToLineCol(sql, secondCaret);
+            int [] end = indexToLineCol(code, secondCaret);
             return new RegionAndSource(
-                sqlSansCaret,
+                codeSansCaret,
                 new ParseRegion(start[0], start[1], end[0], end[1]));
         }
     }
@@ -272,15 +281,19 @@ public static RegionAndSource findPos(String sql)
      * (0-based) offset in a string.
      *
      * <p>Converse of {@link #lineColToIndex(String, int, int)}.
+     *
+     * @param code Source code
+     * @param i Offset within source code
+     * @return 2-element array containing line and column
      */
-    private static int [] indexToLineCol(String sql, int i) {
+    private static int [] indexToLineCol(String code, int i) {
         int line = 0;
         int j = 0;
         while (true) {
             String s;
-            int rn = sql.indexOf("\r\n", j);
-            int r = sql.indexOf("\r", j);
-            int n = sql.indexOf("\n", j);
+            int rn = code.indexOf("\r\n", j);
+            int r = code.indexOf("\r", j);
+            int n = code.indexOf("\n", j);
             int prevj = j;
             if ((r < 0) && (n < 0)) {
                 assert rn < 0;
@@ -299,6 +312,7 @@ public static RegionAndSource findPos(String sql)
             if ((j < 0) || (j > i)) {
                 return new int[] { line + 1, i - prevj + 1 };
             }
+            assert s != null;
             j += s.length();
             ++line;
         }
@@ -309,14 +323,19 @@ public static RegionAndSource findPos(String sql)
      * line and column (1-based).
      *
      * <p>Converse of {@link #indexToLineCol(String, int)}.
-     */
-    public static int lineColToIndex(String sql, int line, int column)
+     *
+     * @param code Source code
+     * @param line Line number
+     * @param column Column number
+     * @return Offset within source code
+      */
+    private static int lineColToIndex(String code, int line, int column)
     {
         --line;
         --column;
         int i = 0;
         while (line-- > 0) {
-            i = sql.indexOf(NL, i)
+            i = code.indexOf(NL, i)
                 + NL.length();
         }
         return i + column;
@@ -329,6 +348,9 @@ public static int lineColToIndex(String sql, int line, int column)
      * <p>For example, for the region <code>(1, 9, 1, 12)</code> and source
      * <code>"values (foo)"</code>,
      * yields the string <code>"values (^foo^)"</code>.
+     *
+     * @param source Source code
+     * @return Source code annotated with position
      */
     public String annotate(String source) {
         return addCarets(source, startLine, startColumn, endLine, endColumn);
@@ -338,6 +360,13 @@ public String annotate(String source) {
      * Converts a string to a string with one or two carets in it. For example,
      * <code>addCarets("values (foo)", 1, 9, 1, 11)</code> yields "values
      * (^foo^)".
+     *
+     * @param sql Source code
+     * @param line Line number
+     * @param col Column number
+     * @param endLine Line number of end of region
+     * @param endCol Column number of end of region
+     * @return String annotated with region
      */
     private static String addCarets(
         String sql,
diff --git a/src/org/olap4j/mdx/ParseTreeVisitor.java b/src/org/olap4j/mdx/ParseTreeVisitor.java
index b62647e..90b80d3 100644
--- a/src/org/olap4j/mdx/ParseTreeVisitor.java
+++ b/src/org/olap4j/mdx/ParseTreeVisitor.java
@@ -12,6 +12,12 @@
 /**
  * Interface for a visitor to an MDX parse tree.
  *
+ * <p>Together with the
+ * {@link org.olap4j.mdx.ParseTreeNode#accept(ParseTreeVisitor)} method, an
+ * class implementing this interface implements a visitor pattern, to allow
+ * an algorithm to efficiently traverse a parse tree and perform an action at
+ * each node dependent upon the type of each node.
+ *  
  * @author jhyde
  * @version $Id$
  * @since Jul 21, 2006
@@ -20,7 +26,10 @@ public interface ParseTreeVisitor<T> {
     /**
      * Visits a select statement.
      *
-     * @param selectNode Node representing a SELECT statement
+     * @param selectNode Node representing a select statement
+     *
+     * @return value yielded by visiting the node
+     *
      * @see SelectNode#accept(ParseTreeVisitor)
      */
     T visit(SelectNode selectNode);
@@ -28,6 +37,10 @@ public interface ParseTreeVisitor<T> {
     /**
      * Visits an axis of a select statement.
      *
+     * @param axis Node representing an axis
+     *
+     * @return value yielded by visiting the node
+     *
      * @see AxisNode#accept(ParseTreeVisitor)
      */
     T visit(AxisNode axis);
@@ -35,6 +48,10 @@ public interface ParseTreeVisitor<T> {
     /**
      * Visits a member declaration.
      *
+     * @param calcMemberNode Node representing a member declaration
+     *
+     * @return value yielded by visiting the node
+     *
      * @see WithMemberNode#accept(ParseTreeVisitor)
      */
     T visit(WithMemberNode calcMemberNode);
@@ -42,6 +59,10 @@ public interface ParseTreeVisitor<T> {
     /**
      * Visits a set declaration.
      *
+     * @param calcSetNode Node representing a set declaration
+     *
+     * @return value yielded by visiting the node
+     *
      * @see WithSetNode#accept(ParseTreeVisitor)
      */
     T visit(WithSetNode calcSetNode);
@@ -49,13 +70,21 @@ public interface ParseTreeVisitor<T> {
     /**
      * Visits a call to an operator or function.
      *
+     * @param call Node representing a call to an operator or function
+     *
      * @see CallNode#accept(ParseTreeVisitor)
+     *
+     * @return value yielded by visiting the node
      */
     T visit(CallNode call);
 
     /**
      * Visits an identifier.
      *
+     * @param id Node representing an identifier
+     *
+     * @return value yielded by visiting the node
+     *
      * @see IdentifierNode#accept(ParseTreeVisitor)
      */
     T visit(IdentifierNode id);
@@ -63,40 +92,69 @@ public interface ParseTreeVisitor<T> {
     /**
      * Visits a parameter.
      *
+     * @param parameterNode Node representing use of a parameter
+     *
+     * @return value yielded by visiting the node
+     *
      * @see ParameterNode#accept(ParseTreeVisitor)
      */
     T visit(ParameterNode parameterNode);
 
     /**
-     * Visits a usage of a {@link org.olap4j.metadata.Cube} in a query.
+     * Visits a use of a {@link org.olap4j.metadata.Cube}
+     * in a select statement.
+     *
+     * @param cubeNode Node representing a use of a Cube
+     *
+     * @return value yielded by visiting the node
      *
      * @see CubeNode#accept(ParseTreeVisitor)
      */
     T visit(CubeNode cubeNode);
 
     /**
-     * Visits a usage of a {@link org.olap4j.metadata.Dimension} in a query.
+     * Visits a use of a {@link org.olap4j.metadata.Dimension}
+     * in a select statement.
+     *
+     * @param dimensionNode Node representing a use of a Dimension
+     *
+     * @return value yielded by visiting the node
      *
      * @see DimensionNode#accept(ParseTreeVisitor)
      */
     T visit(DimensionNode dimensionNode);
 
     /**
-     * Visits a usage of a {@link org.olap4j.metadata.Hierarchy} in a query.
+     * Visits a use of a {@link org.olap4j.metadata.Hierarchy}
+     * in a select statement.
+     *
+     * @param hierarchyNode Node representing a use of a Hierarchy
+     *
+     * @return value yielded by visiting the node
      *
      * @see HierarchyNode#accept(ParseTreeVisitor)
      */
     T visit(HierarchyNode hierarchyNode);
 
     /**
-     * Visits a usage of a {@link org.olap4j.metadata.Level} in a query.
+     * Visits a use of a {@link org.olap4j.metadata.Level}
+     * in a select statement.
+     *
+     * @param levelNode Node representing a use of a Level
+     *
+     * @return value yielded by visiting the node
      *
      * @see LevelNode#accept(ParseTreeVisitor)
      */
-    T visit(LevelNode levelExpr);
+    T visit(LevelNode levelNode);
 
     /**
-     * Visits a usage of a {@link org.olap4j.metadata.Member} in a query.
+     * Visits a use of a {@link org.olap4j.metadata.Member}
+     * in a select statement.
+     *
+     * @param memberNode Node representing a use of a Member
+     *
+     * @return value yielded by visiting the node
      *
      * @see MemberNode#accept(ParseTreeVisitor)
      */
@@ -105,6 +163,10 @@ public interface ParseTreeVisitor<T> {
     /**
      * Visits a literal.
      *
+     * @param literalNode Node representing a Literal
+     *
+     * @return value yielded by visiting the node
+     *
      * @see LiteralNode#accept(ParseTreeVisitor)
      */
     T visit(LiteralNode literalNode);
@@ -112,6 +174,10 @@ public interface ParseTreeVisitor<T> {
     /**
      * Visits a property-value pair.
      *
+     * @param propertyValueNode Node representing a property-value pair
+     *
+     * @return value yielded by visiting the node
+     *
      * @see PropertyValueNode#accept(ParseTreeVisitor)
      */
     T visit(PropertyValueNode propertyValueNode);
diff --git a/src/org/olap4j/mdx/PropertyValueNode.java b/src/org/olap4j/mdx/PropertyValueNode.java
index a26b89d..63245b6 100644
--- a/src/org/olap4j/mdx/PropertyValueNode.java
+++ b/src/org/olap4j/mdx/PropertyValueNode.java
@@ -33,6 +33,7 @@ public class PropertyValueNode implements ParseTreeNode {
     /**
      * Creates a PropertyValueNode.
      *
+     * @param region Region of source code
      * @param name Name of property
      * @param expression Expression for value of property (often a literal)
      */
@@ -54,10 +55,20 @@ public Type getType() {
         return expression.getType();
     }
 
+    /**
+     * Returns the expression by which the value of the property is derived.
+     *
+     * @return the expression by which the value of the property is derived
+     */
     public ParseTreeNode getExpression() {
         return expression;
     }
 
+    /**
+     * Returns the name of the property
+     *
+     * @return name of the property
+     */
     public String getName() {
         return name;
     }
diff --git a/src/org/olap4j/mdx/SelectNode.java b/src/org/olap4j/mdx/SelectNode.java
index f88f0a5..5eb48ae 100644
--- a/src/org/olap4j/mdx/SelectNode.java
+++ b/src/org/olap4j/mdx/SelectNode.java
@@ -26,7 +26,7 @@ public class SelectNode implements ParseTreeNode {
     private final ParseRegion region;
     private final List<ParseTreeNode> withList;
     private final List<AxisNode> axisList;
-    private final AxisNode slicerAxis;
+    private final AxisNode filterAxis;
     private final List<IdentifierNode> cellPropertyList;
     private ParseTreeNode from;
 
@@ -38,7 +38,7 @@ public class SelectNode implements ParseTreeNode {
      *   a <code>WITH</code> clause
      * @param axisList List of axes
      * @param from Name of cube
-     * @param slicerAxis Slicer axis
+     * @param filterAxis Filter axis
      * @param cellPropertyList List of properties
      */
     public SelectNode(
@@ -46,17 +46,23 @@ public SelectNode(
         List<ParseTreeNode> withList,
         List<AxisNode> axisList,
         ParseTreeNode from,
-        AxisNode slicerAxis,
+        AxisNode filterAxis,
         List<IdentifierNode> cellPropertyList)
     {
         this.region = region;
         this.withList = withList;
         this.axisList = axisList;
         this.from = from;
-        this.slicerAxis = slicerAxis;
+        this.filterAxis = filterAxis;
         this.cellPropertyList = cellPropertyList;
     }
 
+    /**
+     * Creates an empty SelectNode.
+     *
+     * <p>The contents of the SelectNode, such as the axis list, can be
+     * populated after construction.
+     */
     public SelectNode() {
         this(
             null,
@@ -102,10 +108,10 @@ public void unparse(ParseTreeWriter writer) {
         pw.println();
         pw.print("FROM ");
         from.unparse(writer);
-        if (slicerAxis != null) {
+        if (filterAxis != null) {
             pw.println();
             pw.print("WHERE ");
-            slicerAxis.unparse(writer);
+            filterAxis.unparse(writer);
         }
         if (!cellPropertyList.isEmpty()) {
             pw.println();
@@ -120,16 +126,48 @@ public void unparse(ParseTreeWriter writer) {
         }
     }
 
+    /**
+     * Returns a list of calculated members and sets defined as the WITH
+     * clause of this SelectNode.
+     *
+     * <p>For example, the WITH clause of query
+     *
+     * <blockquote>
+     * <code>WITH MEMBER [Measures].[Foo] AS ' [Measures].[Unit Sales] * 2 '
+     *   SET [Customers].[Top] AS ' TopCount([Customers].Members, 10) '
+     * SELECT FROM [Sales]</code>
+     * </blockquote>
+     *
+     * contains one {@link org.olap4j.mdx.WithMemberNode} and one
+     * {@link org.olap4j.mdx.WithSetNode}.
+     *
+     * <p>The returned list is mutable.
+     *
+     * @return list of calculated members and sets
+     */
     public List<ParseTreeNode> getWithList() {
         return withList;
     }
 
+    /**
+     * Returns a list of axes in this SelectNode.
+     *
+     * <p>The returned list is mutable.
+     *
+     * @return list of axes
+     */
     public List<AxisNode> getAxisList() {
         return axisList;
     }
 
-    public AxisNode getSlicerAxis() {
-        return slicerAxis;
+    /**
+     * Returns the filter axis defined by the WHERE clause of this SelectNode,
+     * or null if there is no filter axis.
+     *
+     * @return filter axis
+     */
+    public AxisNode getFilterAxis() {
+        return filterAxis;
     }
 
     /**
diff --git a/src/org/olap4j/mdx/Syntax.java b/src/org/olap4j/mdx/Syntax.java
index 1371882..ae6c307 100644
--- a/src/org/olap4j/mdx/Syntax.java
+++ b/src/org/olap4j/mdx/Syntax.java
@@ -297,6 +297,13 @@ public void unparse(
         throw new UnsupportedOperationException();
     }
 
+    /**
+     * Returns whether a collection of parse tree nodes need to be enclosed
+     * in parentheses.
+     *
+     * @param args Parse tree nodes
+     * @return Whether nodes need to be enclosed in parentheses
+     */
     private static boolean needParen(List<ParseTreeNode> args) {
         return !(args.size() == 1 &&
             args.get(0) instanceof CallNode &&
diff --git a/src/org/olap4j/mdx/WithMemberNode.java b/src/org/olap4j/mdx/WithMemberNode.java
index b3cd9a6..d5b5dca 100644
--- a/src/org/olap4j/mdx/WithMemberNode.java
+++ b/src/org/olap4j/mdx/WithMemberNode.java
@@ -36,6 +36,11 @@ public class WithMemberNode implements ParseTreeNode {
 
     /**
      * Constructs a formula specifying a member.
+     *
+     * @param region Source code region
+     * @param name   Name of member being declared
+     * @param exp    Expression for value of member
+     * @param memberPropertyList Collection of properties of member
      */
     public WithMemberNode(
         ParseRegion region,
@@ -73,8 +78,10 @@ public void unparse(ParseTreeWriter writer) {
      *
      * <p>The name is as specified in the parse tree; it may not be identical
      * to the unique name of the member.
+     *
+     * @return Name of member
      */
-    public IdentifierNode getName() {
+    public IdentifierNode getIdentifier() {
         return name;
     }
 
diff --git a/src/org/olap4j/mdx/WithSetNode.java b/src/org/olap4j/mdx/WithSetNode.java
index e8a008a..24a94b3 100644
--- a/src/org/olap4j/mdx/WithSetNode.java
+++ b/src/org/olap4j/mdx/WithSetNode.java
@@ -14,7 +14,7 @@
 import java.io.PrintWriter;
 
 /**
- * Parse tree node which declares a calculated member. Represented as the
+ * Parse tree node which declares a calculated set. Represented as the
  * <code>WITH SET</code> clause of an MDX <code>SELECT</code> statement.
  *
  * @version $Id$
diff --git a/src/org/olap4j/mdx/parser/MdxParseException.java b/src/org/olap4j/mdx/parser/MdxParseException.java
index 7fee1ae..1bb1db4 100644
--- a/src/org/olap4j/mdx/parser/MdxParseException.java
+++ b/src/org/olap4j/mdx/parser/MdxParseException.java
@@ -21,11 +21,31 @@
 public class MdxParseException extends RuntimeException {
     private final ParseRegion region;
 
+    /**
+     * Creates an MdxParseException with a region of the source code and a
+     * specified cause.
+     *
+     * @param region Region of source code which contains the error
+     *
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link #getCause()} method).  (A <tt>null</tt> value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     */
     public MdxParseException(ParseRegion region, Throwable cause) {
         super(cause);
         this.region = region;
     }
 
+    /**
+     * Creates an MdxParseException with a region of the source code and a
+     * specified detail message.
+     *
+     * @param region Region of source code which contains the error
+     *
+     * @param   message   the detail message. The detail message is saved for
+     *          later retrieval by the {@link #getMessage()} method.
+     */
     public MdxParseException(ParseRegion region, String message) {
         super(message);
         this.region = region;
diff --git a/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup b/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup
index 9f18c32..1361429 100644
--- a/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup
+++ b/src/org/olap4j/mdx/parser/impl/DefaultMdxParser.cup
@@ -147,14 +147,14 @@ parser code {:
         List<ParseTreeNode> withList,
         List<AxisNode> axisList,
         IdentifierNode cubeName,
-        ParseTreeNode slicer,
+        ParseTreeNode filter,
         List<IdentifierNode> cellProps)
     {
-        final AxisNode slicerAxis =
-            slicer == null ?
+        final AxisNode filterAxis =
+            filter == null ?
                 null :
                 new AxisNode(
-                    slicer.getRegion(), false, slicer, Axis.SLICER,
+                    filter.getRegion(), false, filter, Axis.FILTER,
                     Collections.EMPTY_LIST);
         // sort axes by ordinal
         Collections.sort(axisList, new Comparator<AxisNode>() {
@@ -163,7 +163,7 @@ parser code {:
             }
         });
         return new SelectNode(
-            region, withList, axisList, cubeName, slicerAxis, cellProps);
+            region, withList, axisList, cubeName, filterAxis, cellProps);
     }
 
     // Override lr_parser methods for NLS.  With this error handling scheme,
@@ -339,7 +339,7 @@ non terminal ParseTreeNode
     else_clause_opt,
     expression,
     factor,
-    slicer_specification,
+    filter_specification,
     term,
     term2,
     term3,
@@ -821,11 +821,11 @@ value_expression_primary ::=
             RESULT = new IdentifierNode(i);
         :}
     |   value_expression_primary:i DOT unquoted_identifier:j {:
-            if (i instanceof IdentifierNode && !parser.isFunCall(j.name)) {
+            if (i instanceof IdentifierNode && !parser.isFunCall(j.getName())) {
                 RESULT = ((IdentifierNode) i).append(j);
             } else {
                 ParseRegion region = createRegion(ileft, jright);
-                RESULT = new CallNode(region, j.name, Syntax.Property, i);
+                RESULT = new CallNode(region, j.getName(), Syntax.Property, i);
             }
         :}
     |   value_expression_primary:i DOT quoted_identifier:j {:
@@ -834,7 +834,7 @@ value_expression_primary ::=
             } else {
                 ParseRegion region = createRegion(ileft, jright);
                 RESULT = new CallNode(region,
-                    j.name, Syntax.QuotedProperty, i);
+                    j.getName(), Syntax.QuotedProperty, i);
             }
         :}
     |   value_expression_primary:i DOT amp_quoted_identifier:j {:
@@ -843,20 +843,20 @@ value_expression_primary ::=
             } else {
                 ParseRegion region = createRegion(ileft, jright);
                 RESULT = new CallNode(region,
-                    j.name, Syntax.AmpersandQuotedProperty, i);
+                    j.getName(), Syntax.AmpersandQuotedProperty, i);
             }
         :}
     |   value_expression_primary:i DOT identifier:j LPAREN exp_list_opt:lis RPAREN:rparen {:
             lis.add(0, i);
             ParseRegion region = createRegion(ileft, rparenright);
-            RESULT = new CallNode(region, j.name, Syntax.Method, lis);
+            RESULT = new CallNode(region, j.getName(), Syntax.Method, lis);
         :}
     |   identifier:i LPAREN exp_list_opt:lis RPAREN:rparen {:
             ParseRegion region = createRegion(ileft, rparenright);
-            RESULT = new CallNode(region, i.name, Syntax.Function, lis);
+            RESULT = new CallNode(region, i.getName(), Syntax.Function, lis);
         :}
     |   CAST:cast LPAREN expression:e AS identifier:t RPAREN:rparen {:
-            LiteralNode symbol = LiteralNode.createSymbol(t.getRegion(), t.name);
+            LiteralNode symbol = LiteralNode.createSymbol(t.getRegion(), t.getName());
             ParseRegion region = createRegion(castleft, rparenright);
             RESULT = new CallNode(region, "CAST", Syntax.Cast, e, symbol);
         :}
@@ -1252,7 +1252,7 @@ exp_list ::=
 //                         SELECT [<axis_specification>
 //                                [, <axis_specification>...]]
 //                         FROM [<cube_specification>]
-//                         WHERE [<slicer_specification>]
+//                         WHERE [<filter_specification>]
 //                         [<cell_props>]
 // jhyde: The above is wrong... you can omit 'WHERE'.
 statement ::=
@@ -1296,7 +1296,7 @@ axis_specification_list ::=
     ;
 where_clause_opt ::=
         /* empty */
-    |   WHERE slicer_specification:s {: RESULT = s; :};
+    |   WHERE filter_specification:s {: RESULT = s; :};
 cell_props_opt ::=
         /* empty */ {:
             RESULT = new LinkedList();
@@ -1382,7 +1382,7 @@ member_name ::= compound_id;
 member_property_definition ::=
         identifier:id EQ value_expression:e {:
             ParseRegion region = createRegion(idleft, eright);
-            RESULT = new PropertyValueNode(region, id.name, e);
+            RESULT = new PropertyValueNode(region, id.getName(), e);
         :}
     ;
 //
@@ -1457,7 +1457,7 @@ dim_props_opt ::=
 //               | SECTIONS
 //               | AXIS(<index>)
 axis_name ::=
-        identifier:i {: RESULT = i.name; :}
+        identifier:i {: RESULT = i.getName(); :}
     ;
 
 axis_number ::=
@@ -1493,8 +1493,8 @@ cube_specification ::=
         cube_name;
 
 //
-// <slicer_specification> ::= {<set> | <tuple>}
-slicer_specification ::=
+// <filter_specification> ::= {<set> | <tuple>}
+filter_specification ::=
         expression;
 //
 // <cell_props> ::= [CELL] PROPERTIES <cell_property> [, <cell_property>...]
@@ -1547,14 +1547,14 @@ cell_property ::= compound_id;
 // this feature.
 //
 //
-// Support for <set> in <slicer_specification> is optional. Consumers can check
+// Support for <set> in <filter_specification> is optional. Consumers can check
 // the value of the property MDPROP_MDX_SLICER to see whether a provider
 // supports this feature.
 //
 //
 // Support for more than one cube name in <cube_specification> is
 // optional. Support for having no cube name in the FROM clause (that is, the
-// cube is implicitly defined by the axis and slicer dimensions) is also
+// cube is implicitly defined by the axis and filter dimensions) is also
 // optional. Consumers can check the value of the property MDPROP_MDX_JOINCUBES
 // to see whether a provider supports this feature.
 //
diff --git a/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java b/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java
index df3597f..9dd1772 100644
--- a/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java
+++ b/src/org/olap4j/mdx/parser/impl/DefaultMdxParserImpl.java
@@ -23,7 +23,7 @@
  */
 public class DefaultMdxParserImpl implements MdxParser {
     private final OlapConnection connection;
-    private boolean debug = true;
+    private boolean debug = false;
     private boolean load = false;
     private final FunTable funTable = new FunTable() {
         public boolean isProperty(String s) {
diff --git a/src/org/olap4j/metadata/Cube.java b/src/org/olap4j/metadata/Cube.java
index f549c87..c661ec2 100644
--- a/src/org/olap4j/metadata/Cube.java
+++ b/src/org/olap4j/metadata/Cube.java
@@ -145,7 +145,12 @@ public interface Cube extends MetadataElement {
      * dimension.
      *
      * @param nameParts Components of the fully-qualified member name
-     * @return member with the given name, or null if not found
+     *
+     * @param treeOps Collection of tree operations to travel relative to
+     * given member in order to create list of members
+     *
+     * @return collection of members related to the given member, or empty
+     * set if the member is not found
      */
     List<Member> lookupMembers(
         Set<Member.TreeOp> treeOps,
diff --git a/src/org/olap4j/metadata/Hierarchy.java b/src/org/olap4j/metadata/Hierarchy.java
index d5d2aab..dbc24bf 100644
--- a/src/org/olap4j/metadata/Hierarchy.java
+++ b/src/org/olap4j/metadata/Hierarchy.java
@@ -9,8 +9,6 @@
 */
 package org.olap4j.metadata;
 
-import org.olap4j.OlapException;
-
 /**
  * An organization of the set of {@link Member}s in a {@link Dimension} and
  * their positions relative to one another.
diff --git a/src/org/olap4j/metadata/Member.java b/src/org/olap4j/metadata/Member.java
index d1ca29b..cfb220c 100644
--- a/src/org/olap4j/metadata/Member.java
+++ b/src/org/olap4j/metadata/Member.java
@@ -42,6 +42,8 @@ public interface Member extends MetadataElement {
 
     /**
      * Returns the parent of this Member, or null if it has no parent.
+     *
+     * @return Parent member, or null if member has no parent
      */
     Member getParentMember();
 
@@ -49,6 +51,8 @@ public interface Member extends MetadataElement {
      * Returns the Level of this Member.
      *
      * <p>Never returns null.</p>
+     *
+     * @return Level which this Member belongs to
      */
     Level getLevel();
 
@@ -57,6 +61,8 @@ public interface Member extends MetadataElement {
      *
      * <p>Never returns null.
      * Result is always the same as <code>getLevel().getHierarchy()</code>.
+     *
+     * @return Hierarchy which this Member belongs to
      */
     Hierarchy getHierarchy();
 
@@ -65,6 +71,8 @@ public interface Member extends MetadataElement {
      *
      * <p>Never returns null. Result is always the same as
      * <code>getLevel().getHierarchy().getDimension()</code>.
+     *
+     * @return Dimension which this Member belongs to
      */
     Dimension getDimension();
 
@@ -72,6 +80,8 @@ public interface Member extends MetadataElement {
      * Returns the type of this Member.
      *
      * <p>Never returns null.</p>
+     *
+     * @return What kind of member this is
      */
     Type getMemberType();
 
@@ -123,6 +133,9 @@ private Type(int ordinal) {
     /**
      * Returns whether <code>member</code> is equal to, a child of, or a
      * descendent of this Member.
+     *
+     * @param member Member
+     * @return Whether the given Member is a descendent of this Member
      */
     boolean isChildOrEqualTo(Member member);
 
@@ -133,24 +146,43 @@ private Type(int ordinal) {
      * those defined using a <code>WITH MEMBER</code> clause in an MDX query
      * ({@link #getMemberType()} will return {@link Type#FORMULA} for these),
      *  or a calculated member defined in a cube.
+     *
+     * @return Whether this Member is calculated
+     *
+     * @see #isCalculatedInQuery()
      */
     boolean isCalculated();
 
     /**
      * Returns the solve order of this member in a formula.
+     *
+     * @return solve order of this Member
      */
     int getSolveOrder();
 
+    /**
+     * Expression by which this member is derived, if it is a calculated
+     * member. If the member is not calulated, returns null.
+     *
+     * @return expression for this member
+     */
     ParseTreeNode getExpression();
 
     /**
      * Returns array of all members, which are ancestor to <code>this</code>.
+     *
+     * @return ancestor Members
      */
     List<Member> getAncestorMembers();
 
     /**
-     * Returns whether this member is computed from a <code>with member</code>
-     * clause in an mdx query.
+     * Returns whether this member is computed from a <code>WITH MEMBER</code>
+     * clause in an MDX query. (Calculated members can also be calculated in a
+     * cube.)
+     *
+     * @return Whether this member is calculated in a query
+     *
+     * @see #isCalculated()
      */
     boolean isCalculatedInQuery();
 
@@ -223,12 +255,16 @@ private Type(int ordinal) {
 
     /**
      * Returns the ordinal of the member.
+     *
+     * @return ordinal of this Member
      */
     int getOrdinal();
 
     /**
      * Returns whether this member is 'hidden', as per the rules which define
      * a ragged hierarchy.
+     *
+     * @return whether this member is a hidden member of a ragged hierarchy
      */
     boolean isHidden();
 
@@ -238,15 +274,19 @@ private Type(int ordinal) {
      * <p>In regular hierarchies, this is as the same as the level's depth,
      * but in parent-child and ragged hierarchies the value may be
      * different.</p>
+     *
+     * @return depth of this Member
      */
     int getDepth();
 
     /**
      * Returns the system-generated data member that is associated with a
-     * nonleaf member of a dimension.
+     * non-leaf member of a dimension.
      *
      * <p>Returns this member if this member is a leaf member, or if the
-     * nonleaf member does not have an associated data member.</p>
+     * non-leaf member does not have an associated data member.</p>
+     *
+     * @return system-generated data member
      */
     Member getDataMember();
 
diff --git a/src/org/olap4j/metadata/Property.java b/src/org/olap4j/metadata/Property.java
index f896a29..fc7a0af 100644
--- a/src/org/olap4j/metadata/Property.java
+++ b/src/org/olap4j/metadata/Property.java
@@ -228,7 +228,8 @@ private StandardMemberProperty(
             Datatype type,
             int ordinal,
             boolean internal,
-            String description) {
+            String description)
+        {
 //            assert ordinal == ordinal();
             this.internal = internal;
             this.type = type;
@@ -347,8 +348,9 @@ private StandardCellProperty(
             Datatype type,
             int ordinal,
             boolean internal,
-            String description) {
-            assert ordinal == ordinal();
+            String description)
+        {
+//            assert ordinal == ordinal();
             this.type = type;
             this.internal = internal;
             this.description = description;
diff --git a/src/org/olap4j/query/Query.java b/src/org/olap4j/query/Query.java
index 220354a..3b13b2d 100644
--- a/src/org/olap4j/query/Query.java
+++ b/src/org/olap4j/query/Query.java
@@ -31,7 +31,7 @@ public class Query {
     protected Map<Axis, QueryAxis> axes = new HashMap<Axis, QueryAxis>();
     protected QueryAxis across;
     protected QueryAxis down;
-    protected QueryAxis slicer;
+    protected QueryAxis filter;
     protected QueryAxis unused;
     protected final Cube cube;
     protected Map<String, QueryDimension> dimensionMap =
@@ -56,11 +56,11 @@ public Query(String name, Cube cube) throws SQLException {
         }
         across = new QueryAxis(this, Axis.COLUMNS);
         down = new QueryAxis(this, Axis.ROWS);
-        slicer = new QueryAxis(this, Axis.SLICER);
+        filter = new QueryAxis(this, Axis.FILTER);
         axes.put(null, unused);
         axes.put(Axis.COLUMNS, across);
         axes.put(Axis.ROWS, down);
-        axes.put(Axis.SLICER, slicer);
+        axes.put(Axis.FILTER, filter);
     }
 
     /**
@@ -82,7 +82,7 @@ public QueryDimension getDimension(String name) {
      * Swaps rows and columns axes. Only applicable if there are two axes.
      */
     public void swapAxes() {
-        // Only applicable if there are two axes - plus slicer and unused.
+        // Only applicable if there are two axes - plus filter and unused.
         if (axes.size() != 4) {
             throw new IllegalArgumentException();
         }
diff --git a/src/org/olap4j/type/BooleanType.java b/src/org/olap4j/type/BooleanType.java
index f8275f6..c9f75de 100755
--- a/src/org/olap4j/type/BooleanType.java
+++ b/src/org/olap4j/type/BooleanType.java
@@ -10,7 +10,7 @@
 package org.olap4j.type;
 
 /**
- * The type of a boolean expression.
+ * The type of a boolean (logical) expression.
  *
  * <p>An example of a boolean expression is the predicate
  *
@@ -23,6 +23,12 @@
  * @version $Id$
  */
 public class BooleanType extends ScalarType {
+    /**
+     * Creates a boolean type.
+     */
+    public BooleanType() {
+    }
+
     public String toString() {
         return "BOOLEAN";
     }
diff --git a/src/org/olap4j/type/DecimalType.java b/src/org/olap4j/type/DecimalType.java
index c5ddeb7..ea20064 100755
--- a/src/org/olap4j/type/DecimalType.java
+++ b/src/org/olap4j/type/DecimalType.java
@@ -48,6 +48,8 @@ public DecimalType(int precision, int scale) {
     /**
      * Returns the maximum number of decimal digits which a value of
      * this type can have.
+     *
+     * @return maximum precision allowed for values of this type
      */
     public int getPrecision() {
         return precision;
@@ -55,6 +57,8 @@ public int getPrecision() {
 
     /**
      * Returns the number of digits to the right of the decimal point.
+     *
+     * @return number of digits to the right of the decimal point
      */
     public int getScale() {
         return scale;
diff --git a/src/org/olap4j/type/DimensionType.java b/src/org/olap4j/type/DimensionType.java
index 1ef15d1..f64af1c 100755
--- a/src/org/olap4j/type/DimensionType.java
+++ b/src/org/olap4j/type/DimensionType.java
@@ -42,14 +42,6 @@ public DimensionType(Dimension dimension) {
         this.digest = buf.toString();
     }
 
-    public static DimensionType forDimension(Dimension dimension) {
-        return new DimensionType(dimension);
-    }
-
-    public static DimensionType forType(Type type) {
-        return new DimensionType(type.getDimension());
-    }
-
     public boolean usesDimension(Dimension dimension, boolean maybe) {
         if (this.dimension == null) {
             return maybe;
diff --git a/src/org/olap4j/type/HierarchyType.java b/src/org/olap4j/type/HierarchyType.java
index 747c6fa..f4ff8b0 100755
--- a/src/org/olap4j/type/HierarchyType.java
+++ b/src/org/olap4j/type/HierarchyType.java
@@ -51,7 +51,8 @@ public HierarchyType(
 
     }
 
-    public static HierarchyType forType(Type type) throws OlapException {
+    // not part of public olap4j API
+    private static HierarchyType forType(Type type) throws OlapException {
         return new HierarchyType(type.getDimension(), type.getHierarchy());
     }
 
diff --git a/src/org/olap4j/type/NullType.java b/src/org/olap4j/type/NullType.java
index 28eb68b..7bf6f8f 100755
--- a/src/org/olap4j/type/NullType.java
+++ b/src/org/olap4j/type/NullType.java
@@ -21,8 +21,11 @@ public class NullType extends ScalarType
     /**
      * Creates a null type.
      */
-    public NullType()
-    {
+    public NullType() {
+    }
+
+    public String toString() {
+        return "NULL";
     }
 }
 // End NullType.java
diff --git a/testsrc/org/olap4j/ConnectionTest.java b/testsrc/org/olap4j/ConnectionTest.java
index 0c64dfa..3a049f0 100644
--- a/testsrc/org/olap4j/ConnectionTest.java
+++ b/testsrc/org/olap4j/ConnectionTest.java
@@ -229,6 +229,25 @@ public void testConnectionUnwrap() throws SQLException {
             assertTrue(e.getMessage().contains("does not implement"));
         }
 
+        // Unwrap and get locale
+        OlapConnection olapConnection =
+            ((OlapWrapper) connection).unwrap(OlapConnection.class);
+        final Locale locale = olapConnection.getLocale();
+        assertEquals(locale, Locale.getDefault());
+
+        // Set locale to something else.
+        olapConnection.setLocale(Locale.CANADA_FRENCH);
+        assertEquals(olapConnection.getLocale(), Locale.CANADA_FRENCH);
+
+        // Try to set locale to null, should get error.
+        try {
+            olapConnection.setLocale(null);
+            fail("expected exception");
+        } catch (IllegalArgumentException e) {
+            // Set if back
+            olapConnection.setLocale(Locale.getDefault());
+        }
+
         // Unwrap the mondrian connection.
         if (helper.isMondrian()) {
             final mondrian.olap.Connection mondrianConnection =
@@ -286,8 +305,6 @@ public void testStatement() throws SQLException {
         connection.close();
     }
 
-    // todo: test statement with no slicer
-
     private enum Method { ClassName, Mode, Type, TypeName, OlapType }
 
     public void testPreparedStatement() throws SQLException {
@@ -470,16 +487,16 @@ public void testCellSetMetaData() throws SQLException {
         PreparedOlapStatement pstmt =
             olapConnection.prepareOlapStatement(mdx);
         final CellSetMetaData cellSetMetaData = pstmt.getMetaData();
-        checkCellSetMetaData(cellSetMetaData);
+        checkCellSetMetaData(cellSetMetaData, 1, null);
 
         // Metadata of its cellset
         final CellSet cellSet = pstmt.executeQuery();
-        checkCellSetMetaData(cellSet.getMetaData());
+        checkCellSetMetaData(cellSet.getMetaData(), 1, cellSet);
 
         // Metadata of regular statement executing string.
         final OlapStatement stmt = olapConnection.createStatement();
         final CellSet cellSet1 = stmt.executeOlapQuery(mdx);
-        checkCellSetMetaData(cellSet1.getMetaData());
+        checkCellSetMetaData(cellSet1.getMetaData(), 1, cellSet1);
 
         // Metadata of regular statement executing parse tree.
         MdxParser mdxParser =
@@ -487,13 +504,91 @@ public void testCellSetMetaData() throws SQLException {
         SelectNode select = mdxParser.parseSelect(mdx);
         final OlapStatement stmt2 = olapConnection.createStatement();
         CellSet cellSet2 = stmt2.executeOlapQuery(select);
-        checkCellSetMetaData(cellSet2.getMetaData());
+        checkCellSetMetaData(cellSet2.getMetaData(), 1, cellSet2);
     }
 
-    private void checkCellSetMetaData(CellSetMetaData cellSetMetaData) {
+    private void checkCellSetMetaData(
+        CellSetMetaData cellSetMetaData,
+        int axesCount, CellSet cellSet)
+    {
         assertNotNull(cellSetMetaData);
-        assertEquals(1, cellSetMetaData.getAxesMetaData().size());
+        assertEquals(axesCount, cellSetMetaData.getAxesMetaData().size());
         assertEquals("Sales", cellSetMetaData.getCube().getName());
+
+        int k = -1;
+        for (CellSetAxisMetaData axisMetaData : cellSetMetaData.getAxesMetaData()) {
+            ++k;
+            assertEquals(Axis.forOrdinal(k), axisMetaData.getAxisOrdinal());
+            assertEquals(k, axisMetaData.getAxisOrdinal().axisOrdinal());
+            assertTrue(axisMetaData.getHierarchies().size() > 0);
+            assertTrue(axisMetaData.getProperties().size() == 0);
+            if (cellSet != null) {
+                final CellSetAxisMetaData cellSetAxisMetaData = cellSet.getAxes().get(k).getAxisMetaData();
+                assertEquals(
+                    cellSetAxisMetaData, axisMetaData);
+            }
+        }
+
+        CellSetAxisMetaData axisMetaData = cellSetMetaData.getFilterAxisMetaData();
+        assertNotNull(axisMetaData);
+        assertEquals(Axis.FILTER, axisMetaData.getAxisOrdinal());
+        assertTrue(axisMetaData.getHierarchies().size() > 0);
+        assertTrue(axisMetaData.getProperties().size() == 0);
+        if (cellSet != null) {
+            assertEquals(
+                cellSet.getFilterAxis().getAxisMetaData(), axisMetaData);
+        }
+    }
+
+    /**
+     * Tests the {@link CellSetAxisMetaData} class, based on an example
+     * in the javadoc of same class.
+     *
+     * @throws Exception on error
+     */
+    public void testCellSetAxisMetaData() throws Exception {
+        Connection connection = helper.createConnection();
+        OlapConnection olapConnection =
+            ((OlapWrapper) connection).unwrap(OlapConnection.class);
+        final String mdx = "SELECT\n"
+            + "   {[Measures].Members} ON COLUMNS,\n"
+            + "   CrossJoin([Store].Members, [Gender].Children)\n"
+            + "   DIMENSION PROPERTIES\n"
+            + "      MEMBER_ORDINAL,\n"
+            + "      MEMBER_UNIQUE_NAME,\n"
+            + "      DISPLAY_INFO ON ROWS\n"
+            + " FROM [Sales]";
+
+        // first via prepared statement
+        final PreparedOlapStatement preparedStmt =
+            olapConnection.prepareOlapStatement(mdx);
+        final CellSetMetaData cellSetMetaData = preparedStmt.getMetaData();
+        checkAxisMetaData(cellSetMetaData.getAxesMetaData().get(1));
+
+        // second via directly executed statement
+        OlapStatement olapStatement = olapConnection.createStatement();
+        final CellSet cellSet =
+            olapStatement.executeOlapQuery(mdx);
+        checkAxisMetaData(cellSet.getAxes().get(1).getAxisMetaData());
+
+        // third via metadata of direct statement
+        checkAxisMetaData(cellSet.getMetaData().getAxesMetaData().get(1));
+    }
+
+    private void checkAxisMetaData(CellSetAxisMetaData cellSetAxisMetaData) {
+        final List<Hierarchy> hierarchies =
+            cellSetAxisMetaData.getHierarchies();
+        assertEquals(2, hierarchies.size());
+        assertEquals("Store", hierarchies.get(0).getName());
+        assertEquals("Gender", hierarchies.get(1).getName());
+        final NamedList<Property> properties =
+            cellSetAxisMetaData.getProperties();
+        assertEquals(3, properties.size());
+        assertEquals("MEMBER_ORDINAL", properties.get(0).getName());
+        assertEquals("MEMBER_UNIQUE_NAME", properties.get(1).getName());
+        assertEquals("DISPLAY_INFO", properties.get(2).getName());
+        assertNotNull(properties.get("DISPLAY_INFO"));
+        assertNull(properties.get("FOO_BAR"));
     }
 
     public void testCellSet() throws SQLException {
@@ -529,29 +624,118 @@ public void testCellSet() throws SQLException {
             s);
     }
 
-    public void testCell() {
-        // todo: test Cell methods
+    public void testCell() throws Exception {
+        Connection connection = helper.createConnection();
+        Statement statement = connection.createStatement();
+        final OlapStatement olapStatement =
+            ((OlapWrapper) statement).unwrap(OlapStatement.class);
+        CellSet cellSet =
+            olapStatement.executeOlapQuery(
+                "SELECT\n" +
+                    " {[Measures].[Unit Sales],\n" +
+                    "    [Measures].[Store Sales]} ON COLUMNS\n," +
+                    " Crossjoin({[Gender].[M]}, [Product].Children) ON ROWS\n" +
+                    "FROM [Sales]\n" +
+                    "WHERE [Time].[1997].[Q2]");
 
-        /*
-             public CellSet getCellSet() {
-    public int getOrdinal() {
-    public List<Integer> getCoordinateList() {
-    public Object getPropertyValue(Property property) {
-    public boolean isEmpty() {
-    public boolean isError() {
-    public boolean isNull() {
-    public double getDoubleValue() throws OlapException {
-    public String getErrorText() {
-    public Object getValue() {
-    public String getFormattedValue() {
-    public ResultSet drillThrough() {
-*/
-        // in particular, create a result set with null, empty and error cells,
-        // and make sure they look different
+        // cell column#1, row#2
+        // cellOrdinal = colOrdinal + rowOrdinal * columnCount
+        //     = 1 + 2 * 2
+        //     = 5
+
+        // access method 1
+        Cell cell = cellSet.getCell(5);
+        assertEquals(5, cell.getOrdinal());
+        assertEquals(12935.16, cell.getValue());
+        assertEquals(12935.16, cell.getDoubleValue());
+        assertEquals("12,935.16", cell.getFormattedValue());
+        assertEquals(cellSet, cell.getCellSet());
+
+        // access method 2
+        cell = cellSet.getCell(Arrays.asList(1, 2));
+        assertEquals(5, cell.getOrdinal());
+
+        // access method 3
+        cell = cellSet.getCell(
+            cellSet.getAxes().get(0).getPositions().get(1),
+            cellSet.getAxes().get(1).getPositions().get(2));
+        assertEquals(5, cell.getOrdinal());
+
+        assertEquals(Arrays.asList(1, 2), cell.getCoordinateList());
+        assertEquals("#,###.00",
+            cell.getPropertyValue(Property.StandardCellProperty.FORMAT_STRING));
+        assertFalse(cell.isEmpty());
+        assertFalse(cell.isError());
+        assertFalse(cell.isNull());
+        assertNull(cell.getErrorText());
+
+        final ResultSet resultSet = cell.drillThrough();
+        assertEquals(5, resultSet.getMetaData().getColumnCount());
+        resultSet.close();
+
+        // cell out of range
+        try {
+            cellSet.getCell(-5);
+            fail("expected exception");
+        } catch (IndexOutOfBoundsException e) {
+            // ok
+        }
+        try {
+            cellSet.getCell(105);
+            fail("expected exception");
+        } catch (IndexOutOfBoundsException e) {
+            // ok
+        }
+        try {
+            cellSet.getCell(Arrays.asList(2, 1));
+            fail("expected exception");
+        } catch (IndexOutOfBoundsException e) {
+            // ok
+        }
+
+        // We provide positions from the wrong axes, but the provider doesn't
+        // notice that they're wrong. That's OK.
+        cell =
+            cellSet.getCell(
+                cellSet.getAxes().get(1).getPositions().get(1),
+                cellSet.getAxes().get(0).getPositions().get(1));
+        assertEquals(3, cell.getOrdinal());
+
+        // Null cell
+        cellSet =
+            olapStatement.executeOlapQuery(
+                "with member [Measures].[X] as 'IIF([Measures].[Store Sales]>10000,[Measures].[Store Sales],Null)'\n" +
+                    "select\n" +
+                    "{[Measures].[X]} on columns,\n" +
+                    "{[Product].[Product Department].members} on rows\n" +
+                    "from Sales");
+        cell = cellSet.getCell(0);
+        assertFalse(cell.isNull());
+        cell = cellSet.getCell(2);
+        assertTrue(cell.isNull());
+
+        // Empty cell
+        cellSet =
+            olapStatement.executeOlapQuery(
+                "select from [Sales]\n"
+                    + "where ([Time].[1997].[Q4].[12],\n"
+                    + "  [Product].[All Products].[Drink].[Alcoholic Beverages].[Beer and Wine].[Beer].[Portsmouth].[Portsmouth Imported Beer],\n"
+                    + "  [Store].[All Stores].[USA].[WA].[Bellingham])");
+        cell = cellSet.getCell(0);
+        assertTrue(cell.isEmpty());
+
+        // Error cell
+        cellSet =
+            olapStatement.executeOlapQuery(
+                "with member [Measures].[Foo] as ' Dimensions(-1).Name '\n"
+                    + "select {[Measures].[Foo]} on columns from [Sales]");
+        cell = cellSet.getCell(0);
+        assertTrue(cell.isError());
+        assertEquals("Index '-1' out of bounds", cell.getErrorText());
 
         // todo: test CellSetAxis methods
         /*
-    public int getOrdinal() {
+    public int getAxisOrdinal() {
     public CellSet getCellSet() {
     public CellSetAxisMetaData getAxisMetaData() {
     public List<Position> getPositions() {
@@ -560,17 +744,12 @@ public ListIterator<Position> iterate() {
 
     todo: test OlapResultAxisMetaData methods
 
-    public org.olap4j.Axis getAxis() {
+    public org.olap4j.Axis getAxisOrdinal() {
     public List<Hierarchy> getHierarchies() {
     public List<Property> getProperties() {
          */
     }
 
-    public void testProperty() {
-        // todo: submit a query with cell and dimension properties, and make
-        // sure the properties appear in the result set
-    }
-
     /**
      * Tests different scrolling characteristics.
      *
@@ -579,8 +758,8 @@ public void testProperty() {
      *  {@link CellSetAxis#getPositions()}.
      *
      * <p>In another mode, you can iterate over the positions, calling
-     * {@link CellSetAxis#iterate()}. Note that this method returns a
-     * {@link java.util.ListIterator}, which has
+     * {@link org.olap4j.CellSetAxis#iterator()}. Note that this method returns
+     * a {@link java.util.ListIterator}, which has
      * {@link java.util.ListIterator#nextIndex()}. We could maybe extend this
      * interface further, to allow to jump forwards/backwards by N.
      *
@@ -695,7 +874,7 @@ public void testUnparsing() {
                 null,
                 false,
                 null,
-                Axis.SLICER,
+                Axis.FILTER,
                 new ArrayList<IdentifierNode>()),
             new ArrayList<IdentifierNode>());
         select.getWithList().add(
@@ -708,14 +887,12 @@ public void testUnparsing() {
                     new IdentifierNode.Segment("Measures"),
                     new IdentifierNode.Segment("Bar")),
                 Arrays.asList(
-                    new PropertyValueNode [] {
-                        new PropertyValueNode(
+                    new PropertyValueNode(
+                        null,
+                        "FORMAT_STRING",
+                        LiteralNode.createString(
                             null,
-                            "FORMAT_STRING",
-                            LiteralNode.createString(
-                                null,
-                                "xxx"))
-                    })));
+                            "xxx")))));
         select.getAxisList().add(
             new AxisNode(
                 null,
@@ -725,10 +902,9 @@ public void testUnparsing() {
                     "{}",
                     Syntax.Braces,
                     Arrays.asList(
-                    new ParseTreeNode [] {
-                        new IdentifierNode(
-                            new IdentifierNode.Segment("Gender"))
-                    })),
+                        (ParseTreeNode)
+                            new IdentifierNode(
+                                new IdentifierNode.Segment("Gender")))),
                 Axis.COLUMNS,
                 new ArrayList<IdentifierNode>()));
         select.getAxisList().add(
@@ -748,7 +924,7 @@ public void testUnparsing() {
                         )),
                 Axis.ROWS,
                 new ArrayList<IdentifierNode>()));
-        select.getSlicerAxis().setExpression(
+        select.getFilterAxis().setExpression(
             new IdentifierNode(
                 new IdentifierNode.Segment("Time"),
                 new IdentifierNode.Segment("1997"),
@@ -1036,7 +1212,7 @@ public void testCubeType() throws Throwable {
     /**
      * Tests the type-derivation for query axes 
      * ({@link org.olap4j.mdx.SelectNode#getAxisList()} and
-     * {@link org.olap4j.mdx.SelectNode#getSlicerAxis()}), and the
+     * {@link org.olap4j.mdx.SelectNode#getFilterAxis()}), and the
      * {@link org.olap4j.type.SetType},
      * {@link org.olap4j.type.TupleType},
      * {@link org.olap4j.type.MemberType} type subclasses.
@@ -1118,15 +1294,52 @@ public void testAxisType() throws Throwable {
         assertTrue(memberType.usesDimension(customersDimension, false));
         assertTrue(memberType.usesDimension(customersDimension, true));
         
-        // Slicer
+        // Filter
 
-        final AxisNode slicerAxis = select.getSlicerAxis();
-        assertNull(slicerAxis.getType());
-        final Type slicerType = slicerAxis.getExpression().getType();
-        assertTrue(slicerType instanceof TupleType);
+        final AxisNode filterAxis = select.getFilterAxis();
+        assertNull(filterAxis.getType());
+        final Type filterType = filterAxis.getExpression().getType();
+        assertTrue(filterType instanceof TupleType);
         assertEquals(
             "TupleType<MemberType<member=[Time].[1997].[Q4]>, MemberType<member=[Marital Status].[All Marital Status].[S]>>",
-            slicerType.toString());
+            filterType.toString());
+    }
+
+    public void testParseQueryWithNoFilter() throws Exception {
+        Class.forName(helper.getDriverClassName());
+        Connection connection = helper.createConnection();
+        OlapConnection olapConnection =
+            ((OlapWrapper) connection).unwrap(OlapConnection.class);
+
+        final MdxParserFactory parserFactory =
+            olapConnection.getParserFactory();
+        MdxParser mdxParser =
+            parserFactory.createMdxParser(olapConnection);
+        MdxValidator mdxValidator =
+            parserFactory.createMdxValidator(olapConnection);
+
+        SelectNode select =
+            mdxParser.parseSelect(
+                "select ([Gender], [Store]) on columns\n,"
+                    + "{[Customers].[City].Members} on rows\n"
+                    + "from [sales]");
+        select = mdxValidator.validateSelect(select);
+        AxisNode filterAxis = select.getFilterAxis();
+        assertNull(filterAxis);
+
+        try {
+            select =
+                mdxParser.parseSelect(
+                    "select ([Gender], [Store]) on columns\n,"
+                        + "{[Customers].[City].Members} on rows\n"
+                        + "from [sales]\n"
+                        + "where ()");
+            fail("expected parse error, got " + select);
+        } catch (RuntimeException e) {
+            assertTrue(
+                getStackTrace(e).indexOf(
+                    "Syntax error at [4:10], token ')'") >= 0);
+        }
     }
 
     // TODO: test for HierarchyType
@@ -1155,6 +1368,66 @@ static String memberListToString(List<Member> list) {
         return buf.toString();
     }
 
+    public void testStatementCancel() throws Throwable {
+        Connection connection = helper.createConnection();
+        OlapConnection olapConnection =
+            ((OlapWrapper) connection).unwrap(OlapConnection.class);
+        final OlapStatement olapStatement = olapConnection.createStatement();
+        final Throwable[] exceptions = {null};
+        new Thread(
+            new Runnable() {
+                public void run() {
+                    try {
+                        Thread.sleep(1000);
+                        olapStatement.cancel();
+                    } catch (Throwable e) {
+                        exceptions[0] = e;
+                    }
+                }
+            }
+        ).start();
+        final CellSet cellSet;
+        try {
+            cellSet = olapStatement.executeOlapQuery(
+                "SELECT [Store].Members * \n"
+                    + " [Customers].Members * \n"
+                    + " [Time].Members on columns\n"
+                    + "from [Sales]");
+            fail("expected exception indicating stmt had been canceled, got cellSet " + cellSet);
+        } catch (RuntimeException e) {
+            assertTrue(e.getMessage().indexOf("Query canceled") >= 0);
+        }
+        if (exceptions[0] != null) {
+            throw exceptions[0];
+        }
+    }
+
+    public void testStatementTimeout() throws Throwable {
+        Connection connection = helper.createConnection();
+        OlapConnection olapConnection =
+            ((OlapWrapper) connection).unwrap(OlapConnection.class);
+        final OlapStatement olapStatement = olapConnection.createStatement();
+
+        try {
+            olapStatement.setQueryTimeout(-1);
+            fail("expected exception");
+        } catch (SQLException e) {
+            assertTrue(e.getMessage().indexOf("illegal timeout value ") >= 0);
+        }
+        olapStatement.setQueryTimeout(1);
+        try {
+            final CellSet cellSet =
+                olapStatement.executeOlapQuery(
+                    "SELECT [Store].Members * \n"
+                        + " [Customers].Members * \n"
+                        + " [Time].Members on columns\n"
+                        + "from [Sales]");
+            fail("expected exception indicating timeout, got cellSet " + cellSet);
+        } catch (RuntimeException e) {
+            assertTrue(e.getMessage().indexOf("Query timeout of ") >= 0);
+        }
+    }
+
     /**
      * Abstracts the information about specific drivers and database instances
      * needed by this test. This allows the same test suite to be used for
diff --git a/testsrc/org/olap4j/OlapTest.java b/testsrc/org/olap4j/OlapTest.java
index 621b64b..6c00798 100644
--- a/testsrc/org/olap4j/OlapTest.java
+++ b/testsrc/org/olap4j/OlapTest.java
@@ -312,7 +312,7 @@ public static void queryToXml(Query query, Document doc, Element parent) {
 
                 axisToXml(query.getAxes().get(Axis.COLUMNS), doc, axes);
                 axisToXml(query.getAxes().get(Axis.ROWS), doc, axes);
-                axisToXml(query.getAxes().get(Axis.SLICER), doc, axes);
+                axisToXml(query.getAxes().get(Axis.FILTER), doc, axes);
 
             } catch (Throwable t) {
                 t.printStackTrace();
@@ -357,7 +357,7 @@ public static void axisToXml(QueryAxis axis, Document doc, Element parent) {
                 switch(axis.getLocation()) {
                 case COLUMNS: addAttribute("location", "across", root); break;
                 case ROWS: addAttribute("location", "down", root); break;
-                case SLICER: addAttribute("location", "slicer", root); break;
+                case FILTER: addAttribute("location", "filter", root); break;
                 }
 
                 List<QueryDimension> dimensions = axis.getDimensions();
diff --git a/testsrc/org/olap4j/test/ParserTest.java b/testsrc/org/olap4j/test/ParserTest.java
index 31be967..b009c0c 100644
--- a/testsrc/org/olap4j/test/ParserTest.java
+++ b/testsrc/org/olap4j/test/ParserTest.java
@@ -410,7 +410,8 @@ public void testMultipleAxes() throws Exception {
         CallNode fun = (CallNode)colsSetExpr;
         IdentifierNode identifier = (IdentifierNode) (fun.getArgList().get(0));
         assertEquals(1, identifier.getSegmentList().size());
-        assertEquals("Correct member on axis", "axis0mbr", identifier.getSegmentList().get(0).name);
+        assertEquals("Correct member on axis", "axis0mbr",
+            identifier.getSegmentList().get(0).getName());
 
         ParseTreeNode rowsSetExpr = axes.get(1).getExpression();
         assertNotNull("Row tuples", rowsSetExpr);
@@ -418,7 +419,8 @@ public void testMultipleAxes() throws Exception {
         fun = (CallNode) rowsSetExpr;
         identifier = (IdentifierNode) (fun.getArgList().get(0));
         assertEquals(1, identifier.getSegmentList().size());
-        assertEquals("Correct member on axis", "axis1mbr", identifier.getSegmentList().get(0).name);
+        assertEquals("Correct member on axis", "axis1mbr",
+            identifier.getSegmentList().get(0).getName());
     }
 
     public void testCaseTest() {
diff --git a/testsrc/org/olap4j/test/TestContext.java b/testsrc/org/olap4j/test/TestContext.java
index fc9d434..d0a3d96 100644
--- a/testsrc/org/olap4j/test/TestContext.java
+++ b/testsrc/org/olap4j/test/TestContext.java
@@ -92,7 +92,7 @@ private static void print(CellSet cellSet, PrintWriter pw) {
             pw.println("Axis #" + (++i) + ":");
             printAxis(pw, axis);
         }
-        // Usually there are 3 axes: {slicer, columns, rows}. Position is a
+        // Usually there are 3 axes: {filter, columns, rows}. Position is a
         // {column, row} pair. We call printRows with axis=2. When it
         // recurses to axis=-1, it prints.
         List<Integer> pos = new ArrayList<Integer>(axes.size());
