--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
@@ -300,7 +300,7 @@ public class MonetDatabaseMetaData exten
 	/**
 	 * Does the database treat mixed case unquoted SQL identifiers
 	 * as case sensitive and as a result store them in mixed case?
-	 * A JDBC-Compliant driver will always return false.
+	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns false.
 	 *
 	 * @return false
 	 */
@@ -344,8 +344,8 @@ public class MonetDatabaseMetaData exten
 
 	/**
 	 * Does the database treat mixed case quoted SQL identifiers as
-	 * case sensitive and as a result store them in mixed case?  A
-	 * JDBC compliant driver will always return true.
+	 * case sensitive and as a result store them in mixed case?
+	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
 	 *
 	 * @return true if so
 	 */
@@ -388,9 +388,10 @@ public class MonetDatabaseMetaData exten
 	}
 
 	/**
-	 * What is the string used to quote SQL identifiers?  This returns
-	 * a space if identifier quoting isn't supported.  A JDBC Compliant
-	 * driver will always use a double quote character.
+	 * What is the string used to quote SQL identifiers?
+	 * This returns a space if identifier quoting isn't supported.
+	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver
+	 * will always use a double quote character.
 	 *
 	 * @return the quoting string
 	 */
@@ -573,8 +574,8 @@ public class MonetDatabaseMetaData exten
 	 * Is column aliasing supported?
 	 *
 	 * <p>If so, the SQL AS clause can be used to provide names for
-	 * computed columns or to provide alias names for columns as
-	 * required.  A JDBC Compliant driver always returns true.
+	 * computed columns or to provide alias names for columns as required.
+	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
 	 *
 	 * <p>e.g.
 	 *
@@ -592,8 +593,8 @@ public class MonetDatabaseMetaData exten
 	}
 
 	/**
-	 * Are concatenations between NULL and non-NULL values NULL? A
-	 * JDBC Compliant driver always returns true
+	 * Are concatenations between NULL and non-NULL values NULL?
+	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
 	 *
 	 * @return true if so
 	 */
@@ -758,8 +759,8 @@ public class MonetDatabaseMetaData exten
 	}
 
 	/**
-	 * Are table correlation names supported? A JDBC Compliant
-	 * driver always returns true.
+	 * Are table correlation names supported?
+	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
 	 *
 	 * @return true if so
 	 */
@@ -839,8 +840,8 @@ public class MonetDatabaseMetaData exten
 	}
 
 	/**
-	 * Is the escape character in "LIKE" clauses supported?  A
-	 * JDBC compliant driver always returns true.
+	 * Is the escape character in "LIKE" clauses supported?
+	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
 	 *
 	 * @return true if so
 	 */
@@ -872,8 +873,8 @@ public class MonetDatabaseMetaData exten
 	}
 
 	/**
-	 * Can columns be defined as non-nullable.	A JDBC Compliant driver
-	 * always returns true.
+	 * Can columns be defined as non-nullable.
+	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
 	 *
 	 * @return true if so
 	 */
@@ -921,8 +922,7 @@ public class MonetDatabaseMetaData exten
 
 	/**
 	 * Does this driver support the ANSI-92 entry level SQL grammar?
-	 * All JDBC Compliant drivers must return true. We should be this
-	 * compliant, so let's 'act' like we are.
+	 * All JDBC Compliant <sup><font size=-2>TM</font></sup> drivers must return true.
 	 *
 	 * @return true if so
 	 */
@@ -1197,8 +1197,9 @@ public class MonetDatabaseMetaData exten
 	}
 
 	/**
-	 * Are subqueries in comparison expressions supported? A JDBC
-	 * Compliant driver always returns true. MonetDB also supports this
+	 * Are subqueries in comparison expressions supported?
+	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
+	 * MonetDB also supports this
 	 *
 	 * @return true if so; false otherwise
 	 */
@@ -1208,8 +1209,8 @@ public class MonetDatabaseMetaData exten
 	}
 
 	/**
-	 * Are subqueries in 'exists' expressions supported? A JDBC
-	 * Compliant driver always returns true.
+	 * Are subqueries in 'exists' expressions supported?
+	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
 	 *
 	 * @return true if so; false otherwise
 	 */
@@ -1219,8 +1220,8 @@ public class MonetDatabaseMetaData exten
 	}
 
 	/**
-	 * Are subqueries in 'in' statements supported? A JDBC
-	 * Compliant driver always returns true.
+	 * Are subqueries in 'in' statements supported?
+	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
 	 *
 	 * @return true if so; false otherwise
 	 */
@@ -1230,8 +1231,8 @@ public class MonetDatabaseMetaData exten
 	}
 
 	/**
-	 * Are subqueries in quantified expressions supported? A JDBC
-	 * Compliant driver always returns true.
+	 * Are subqueries in quantified expressions supported?
+	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
 	 *
 	 * (No idea what this is, but we support a good deal of
 	 * subquerying.)
@@ -1244,8 +1245,8 @@ public class MonetDatabaseMetaData exten
 	}
 
 	/**
-	 * Are correlated subqueries supported? A JDBC Compliant driver
-	 * always returns true.
+	 * Are correlated subqueries supported?
+	 * A JDBC Compliant <sup><font size=-2>TM</font></sup> driver always returns true.
 	 *
 	 * (a.k.a. subselect in from?)
 	 *
@@ -1594,7 +1595,7 @@ public class MonetDatabaseMetaData exten
 
 	/**
 	 * Does the database support the given transaction isolation level?
-	 * We only support TRANSACTION_READ_COMMITTED as far as I know
+	 * We only support TRANSACTION_SERIALIZABLE as far as I know
 	 *
 	 * @param level the values are defined in java.sql.Connection
 	 * @return true if so