diff --git a/reference/quickhash/quickhashinthash/add.xml b/reference/quickhash/quickhashinthash/add.xml
index bf2527abbc..e0abc73c6c 100644
--- a/reference/quickhash/quickhashinthash/add.xml
+++ b/reference/quickhash/quickhashinthash/add.xml
@@ -10,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashIntHash::add</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>value</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntHash::add</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
    This method adds a new entry to the hash, and returns whether the entry was
diff --git a/reference/quickhash/quickhashinthash/construct.xml b/reference/quickhash/quickhashinthash/construct.xml
index 8bad070377..a7d19dc45d 100644
--- a/reference/quickhash/quickhashinthash/construct.xml
+++ b/reference/quickhash/quickhashinthash/construct.xml
@@ -11,8 +11,8 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <methodname>QuickHashIntHash::__construct</methodname>
-   <methodparam><type>integer</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>options</parameter></methodparam>
+   <methodparam><type>int</type><parameter>size</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
   <para>
    This constructor creates a new QuickHashIntHash. The size is the amount of
diff --git a/reference/quickhash/quickhashinthash/delete.xml b/reference/quickhash/quickhashinthash/delete.xml
index bab47cf400..4ea3f92ea6 100644
--- a/reference/quickhash/quickhashinthash/delete.xml
+++ b/reference/quickhash/quickhashinthash/delete.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashIntHash::delete</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntHash::delete</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
    This method deletes an entry from the hash, and returns whether the entry was
diff --git a/reference/quickhash/quickhashinthash/exists.xml b/reference/quickhash/quickhashinthash/exists.xml
index 165826ff23..d8a91c37c6 100644
--- a/reference/quickhash/quickhashinthash/exists.xml
+++ b/reference/quickhash/quickhashinthash/exists.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashIntHash::exists</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntHash::exists</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
    This method checks whether an entry with the provided key exists in the
diff --git a/reference/quickhash/quickhashinthash/get.xml b/reference/quickhash/quickhashinthash/get.xml
index 23a1dcd938..75a2f7d3db 100644
--- a/reference/quickhash/quickhashinthash/get.xml
+++ b/reference/quickhash/quickhashinthash/get.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>integer</type><methodname>QuickHashIntHash::get</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
+   <modifier>public</modifier> <type>int</type><methodname>QuickHashIntHash::get</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
    This method retrieves a value from the hash by its key.
diff --git a/reference/quickhash/quickhashinthash/getsize.xml b/reference/quickhash/quickhashinthash/getsize.xml
index 55c6a964a0..c8722174f3 100644
--- a/reference/quickhash/quickhashinthash/getsize.xml
+++ b/reference/quickhash/quickhashinthash/getsize.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>integer</type><methodname>QuickHashIntHash::getSize</methodname><void/>
+   <modifier>public</modifier> <type>int</type><methodname>QuickHashIntHash::getSize</methodname><void/>
   </methodsynopsis>
   <para>
    Returns the number of elements in the hash.
diff --git a/reference/quickhash/quickhashinthash/loadfromfile.xml b/reference/quickhash/quickhashinthash/loadfromfile.xml
index 9c514fd2e9..1768319ee6 100644
--- a/reference/quickhash/quickhashinthash/loadfromfile.xml
+++ b/reference/quickhash/quickhashinthash/loadfromfile.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashIntHash</type><methodname>QuickHashIntHash::loadFromFile</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>options</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
   <para>
    This factory method creates a new hash from a definition file on disk. The
diff --git a/reference/quickhash/quickhashinthash/loadfromstring.xml b/reference/quickhash/quickhashinthash/loadfromstring.xml
index 0cbd65db2d..4f46c3554d 100644
--- a/reference/quickhash/quickhashinthash/loadfromstring.xml
+++ b/reference/quickhash/quickhashinthash/loadfromstring.xml
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashIntHash</type><methodname>QuickHashIntHash::loadFromString</methodname>
    <methodparam><type>string</type><parameter>contents</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>options</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
   <para>
    This factory method creates a new hash from a definition in a string. The
diff --git a/reference/quickhash/quickhashinthash/set.xml b/reference/quickhash/quickhashinthash/set.xml
index 3c637c0a61..cc18e40040 100644
--- a/reference/quickhash/quickhashinthash/set.xml
+++ b/reference/quickhash/quickhashinthash/set.xml
@@ -11,9 +11,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashIntHash::set</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
-   <methodparam><type>integer</type><parameter>value</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntHash::set</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
+   <methodparam><type>int</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
    This method tries to update an entry with a new value. In case the entry
diff --git a/reference/quickhash/quickhashinthash/update.xml b/reference/quickhash/quickhashinthash/update.xml
index 28fefd1f60..1ccfa361ed 100644
--- a/reference/quickhash/quickhashinthash/update.xml
+++ b/reference/quickhash/quickhashinthash/update.xml
@@ -10,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashIntHash::update</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
-   <methodparam><type>integer</type><parameter>value</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntHash::update</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
+   <methodparam><type>int</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
    This method updates an entry with a new value, and returns whether the entry was
diff --git a/reference/quickhash/quickhashintset/add.xml b/reference/quickhash/quickhashintset/add.xml
index d2bd0c468c..32193ad561 100644
--- a/reference/quickhash/quickhashintset/add.xml
+++ b/reference/quickhash/quickhashintset/add.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashIntSet::add</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntSet::add</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
    This method adds a new entry to the set, and returns whether the entry was
diff --git a/reference/quickhash/quickhashintset/construct.xml b/reference/quickhash/quickhashintset/construct.xml
index b9ee37f3ed..f90a56bd59 100644
--- a/reference/quickhash/quickhashintset/construct.xml
+++ b/reference/quickhash/quickhashintset/construct.xml
@@ -11,8 +11,8 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <methodname>QuickHashIntSet::__construct</methodname>
-   <methodparam><type>integer</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>options</parameter></methodparam>
+   <methodparam><type>int</type><parameter>size</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
   <para>
    This constructor creates a new QuickHashIntSet. The size is the amount of
diff --git a/reference/quickhash/quickhashintset/delete.xml b/reference/quickhash/quickhashintset/delete.xml
index e996e472ca..0edd3cb9e4 100644
--- a/reference/quickhash/quickhashintset/delete.xml
+++ b/reference/quickhash/quickhashintset/delete.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashIntSet::delete</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntSet::delete</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
    This method deletes an entry from the set, and returns whether the entry was
diff --git a/reference/quickhash/quickhashintset/exists.xml b/reference/quickhash/quickhashintset/exists.xml
index 28e88e68fc..a9b6082347 100644
--- a/reference/quickhash/quickhashintset/exists.xml
+++ b/reference/quickhash/quickhashintset/exists.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashIntSet::exists</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntSet::exists</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
    This method checks whether an entry with the provided key exists in the
diff --git a/reference/quickhash/quickhashintset/getsize.xml b/reference/quickhash/quickhashintset/getsize.xml
index a5ebe09806..7078319681 100644
--- a/reference/quickhash/quickhashintset/getsize.xml
+++ b/reference/quickhash/quickhashintset/getsize.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier><type>integer</type><methodname>QuickHashIntSet::getSize</methodname><void/>
+   <modifier>public</modifier><type>int</type><methodname>QuickHashIntSet::getSize</methodname><void/>
   </methodsynopsis>
   <para>
    Returns the number of elements in the set.
diff --git a/reference/quickhash/quickhashintset/loadfromfile.xml b/reference/quickhash/quickhashintset/loadfromfile.xml
index 1d11e4c1cd..21b137c82c 100644
--- a/reference/quickhash/quickhashintset/loadfromfile.xml
+++ b/reference/quickhash/quickhashintset/loadfromfile.xml
@@ -12,8 +12,8 @@
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashIntSet</type><methodname>QuickHashIntSet::loadFromFile</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>options</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>size</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
   <para>
    This factory method creates a new set from a definition file on disk. The
diff --git a/reference/quickhash/quickhashintset/loadfromstring.xml b/reference/quickhash/quickhashintset/loadfromstring.xml
index 9b020e2f67..76ac082f27 100644
--- a/reference/quickhash/quickhashintset/loadfromstring.xml
+++ b/reference/quickhash/quickhashintset/loadfromstring.xml
@@ -12,8 +12,8 @@
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashIntSet</type><methodname>QuickHashIntSet::loadFromString</methodname>
    <methodparam><type>string</type><parameter>contents</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>options</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>size</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
   </methodsynopsis>
   <para>
    This factory method creates a new set from a definition in a string. The
diff --git a/reference/quickhash/quickhashintstringhash/add.xml b/reference/quickhash/quickhashintstringhash/add.xml
index 8b8d190665..f0239cab51 100644
--- a/reference/quickhash/quickhashintstringhash/add.xml
+++ b/reference/quickhash/quickhashintstringhash/add.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashIntStringHash::add</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntStringHash::add</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
    <methodparam><type>string</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/quickhash/quickhashintstringhash/construct.xml b/reference/quickhash/quickhashintstringhash/construct.xml
index baa4e37909..44b7c50421 100644
--- a/reference/quickhash/quickhashintstringhash/construct.xml
+++ b/reference/quickhash/quickhashintstringhash/construct.xml
@@ -11,8 +11,8 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <methodname>QuickHashIntStringHash::__construct</methodname>
-   <methodparam><type>integer</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>options</parameter></methodparam>
+   <methodparam><type>int</type><parameter>size</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    This constructor creates a new QuickHashIntStringHash. The size is the amount of
diff --git a/reference/quickhash/quickhashintstringhash/delete.xml b/reference/quickhash/quickhashintstringhash/delete.xml
index 380ae8de9c..73f784f477 100644
--- a/reference/quickhash/quickhashintstringhash/delete.xml
+++ b/reference/quickhash/quickhashintstringhash/delete.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashIntStringHash::delete</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntStringHash::delete</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
    This method deletes an entry from the hash, and returns whether the entry was
diff --git a/reference/quickhash/quickhashintstringhash/exists.xml b/reference/quickhash/quickhashintstringhash/exists.xml
index a401597e07..d46833bbb3 100644
--- a/reference/quickhash/quickhashintstringhash/exists.xml
+++ b/reference/quickhash/quickhashintstringhash/exists.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashIntStringHash::exists</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntStringHash::exists</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
    This method checks whether an entry with the provided key exists in the
diff --git a/reference/quickhash/quickhashintstringhash/get.xml b/reference/quickhash/quickhashintstringhash/get.xml
index 2c3cf01186..5945335f37 100644
--- a/reference/quickhash/quickhashintstringhash/get.xml
+++ b/reference/quickhash/quickhashintstringhash/get.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>integer</type><methodname>QuickHashIntStringHash::get</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
+   <modifier>public</modifier> <type>mixed</type><methodname>QuickHashIntStringHash::get</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
    This method retrieves a value from the hash by its key.
diff --git a/reference/quickhash/quickhashintstringhash/getsize.xml b/reference/quickhash/quickhashintstringhash/getsize.xml
index d4170bac6e..1de848c82c 100644
--- a/reference/quickhash/quickhashintstringhash/getsize.xml
+++ b/reference/quickhash/quickhashintstringhash/getsize.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>integer</type><methodname>QuickHashIntStringHash::getSize</methodname><void/>
+   <modifier>public</modifier> <type>int</type><methodname>QuickHashIntStringHash::getSize</methodname><void/>
   </methodsynopsis>
   <para>
    Returns the number of elements in the hash.
diff --git a/reference/quickhash/quickhashintstringhash/loadfromfile.xml b/reference/quickhash/quickhashintstringhash/loadfromfile.xml
index 48ab4e835d..0b00bacdfb 100644
--- a/reference/quickhash/quickhashintstringhash/loadfromfile.xml
+++ b/reference/quickhash/quickhashintstringhash/loadfromfile.xml
@@ -12,7 +12,8 @@
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashIntStringHash</type><methodname>QuickHashIntStringHash::loadFromFile</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>options</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>size</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    This factory method creates a new hash from a definition file on disk. The
@@ -75,6 +76,16 @@ key/value 2 (key = 3, string index = 4 ("NINE")):
       </para>
      </listitem>
     </varlistentry>
+    <varlistentry>
+     <term><parameter>size</parameter></term>
+     <listitem>
+      <para>
+       The amount of bucket lists to configure. The number you pass in will be
+       automatically rounded up to the next power of two. It is also
+       automatically limited from 4 to 4194304.
+      </para>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term><parameter>options</parameter></term>
      <listitem>
diff --git a/reference/quickhash/quickhashintstringhash/loadfromstring.xml b/reference/quickhash/quickhashintstringhash/loadfromstring.xml
index f7e0988eec..4e9cd98eea 100644
--- a/reference/quickhash/quickhashintstringhash/loadfromstring.xml
+++ b/reference/quickhash/quickhashintstringhash/loadfromstring.xml
@@ -12,7 +12,8 @@
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashIntStringHash</type><methodname>QuickHashIntStringHash::loadFromString</methodname>
    <methodparam><type>string</type><parameter>contents</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>options</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>size</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    This factory method creates a new hash from a definition in a string. The
@@ -32,6 +33,16 @@
       </para>
      </listitem>
     </varlistentry>
+    <varlistentry>
+     <term><parameter>size</parameter></term>
+     <listitem>
+      <para>
+       The amount of bucket lists to configure. The number you pass in will be
+       automatically rounded up to the next power of two. It is also
+       automatically limited from 4 to 4194304.
+      </para>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term><parameter>options</parameter></term>
      <listitem>
diff --git a/reference/quickhash/quickhashintstringhash/set.xml b/reference/quickhash/quickhashintstringhash/set.xml
index e83461b08b..5b4d9f45a9 100644
--- a/reference/quickhash/quickhashintstringhash/set.xml
+++ b/reference/quickhash/quickhashintstringhash/set.xml
@@ -11,8 +11,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashIntStringHash::set</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
+   <modifier>public</modifier> <type>int</type><methodname>QuickHashIntStringHash::set</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
    <methodparam><type>string</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/quickhash/quickhashintstringhash/update.xml b/reference/quickhash/quickhashintstringhash/update.xml
index 9c6c253065..e02d1fff7e 100644
--- a/reference/quickhash/quickhashintstringhash/update.xml
+++ b/reference/quickhash/quickhashintstringhash/update.xml
@@ -10,8 +10,8 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashIntStringHash::update</methodname>
-   <methodparam><type>integer</type><parameter>key</parameter></methodparam>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashIntStringHash::update</methodname>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
    <methodparam><type>string</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/quickhash/quickhashstringinthash/add.xml b/reference/quickhash/quickhashstringinthash/add.xml
index c7977cb894..026ef6bc38 100644
--- a/reference/quickhash/quickhashstringinthash/add.xml
+++ b/reference/quickhash/quickhashstringinthash/add.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashStringIntHash::add</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashStringIntHash::add</methodname>
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
    <methodparam><type>int</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/quickhash/quickhashstringinthash/construct.xml b/reference/quickhash/quickhashstringinthash/construct.xml
index ea5479ed13..20f5247f79 100644
--- a/reference/quickhash/quickhashstringinthash/construct.xml
+++ b/reference/quickhash/quickhashstringinthash/construct.xml
@@ -11,8 +11,8 @@
   &reftitle.description;
   <methodsynopsis>
    <modifier>public</modifier> <methodname>QuickHashStringIntHash::__construct</methodname>
-   <methodparam><type>integer</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>options</parameter></methodparam>
+   <methodparam><type>int</type><parameter>size</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    This constructor creates a new QuickHashStringIntHash. The size is the amount of
diff --git a/reference/quickhash/quickhashstringinthash/delete.xml b/reference/quickhash/quickhashstringinthash/delete.xml
index 01fdd3955c..d8724d2ec4 100644
--- a/reference/quickhash/quickhashstringinthash/delete.xml
+++ b/reference/quickhash/quickhashstringinthash/delete.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashStringIntHash::delete</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashStringIntHash::delete</methodname>
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/quickhash/quickhashstringinthash/exists.xml b/reference/quickhash/quickhashstringinthash/exists.xml
index aa6cf14a89..fd334454c4 100644
--- a/reference/quickhash/quickhashstringinthash/exists.xml
+++ b/reference/quickhash/quickhashstringinthash/exists.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashStringIntHash::exists</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashStringIntHash::exists</methodname>
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/quickhash/quickhashstringinthash/get.xml b/reference/quickhash/quickhashstringinthash/get.xml
index f55f436977..b5de095933 100644
--- a/reference/quickhash/quickhashstringinthash/get.xml
+++ b/reference/quickhash/quickhashstringinthash/get.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>integer</type><methodname>QuickHashStringIntHash::get</methodname>
+   <modifier>public</modifier> <type>mixed</type><methodname>QuickHashStringIntHash::get</methodname>
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/quickhash/quickhashstringinthash/getsize.xml b/reference/quickhash/quickhashstringinthash/getsize.xml
index 9935cb9e99..2ea1c74780 100644
--- a/reference/quickhash/quickhashstringinthash/getsize.xml
+++ b/reference/quickhash/quickhashstringinthash/getsize.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>integer</type><methodname>QuickHashStringIntHash::getSize</methodname><void/>
+   <modifier>public</modifier> <type>int</type><methodname>QuickHashStringIntHash::getSize</methodname><void/>
   </methodsynopsis>
   <para>
    Returns the number of elements in the hash.
diff --git a/reference/quickhash/quickhashstringinthash/loadfromfile.xml b/reference/quickhash/quickhashstringinthash/loadfromfile.xml
index f37798f35f..1aa42545e4 100644
--- a/reference/quickhash/quickhashstringinthash/loadfromfile.xml
+++ b/reference/quickhash/quickhashstringinthash/loadfromfile.xml
@@ -12,7 +12,8 @@
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashStringIntHash</type><methodname>QuickHashStringIntHash::loadFromFile</methodname>
    <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>options</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>size</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    This factory method creates a new hash from a definition file on disk. The
@@ -87,6 +88,16 @@ bucket lists:
       </para>
      </listitem>
     </varlistentry>
+    <varlistentry>
+     <term><parameter>size</parameter></term>
+     <listitem>
+      <para>
+       The amount of bucket lists to configure. The number you pass in will be
+       automatically rounded up to the next power of two. It is also
+       automatically limited from 4 to 4194304.
+      </para>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term><parameter>options</parameter></term>
      <listitem>
diff --git a/reference/quickhash/quickhashstringinthash/loadfromstring.xml b/reference/quickhash/quickhashstringinthash/loadfromstring.xml
index 9930c766b3..731a6870d4 100644
--- a/reference/quickhash/quickhashstringinthash/loadfromstring.xml
+++ b/reference/quickhash/quickhashstringinthash/loadfromstring.xml
@@ -12,7 +12,8 @@
   <methodsynopsis>
    <modifier>public</modifier> <modifier>static</modifier> <type>QuickHashStringIntHash</type><methodname>QuickHashStringIntHash::loadFromString</methodname>
    <methodparam><type>string</type><parameter>contents</parameter></methodparam>
-   <methodparam choice="opt"><type>integer</type><parameter>options</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>size</parameter><initializer>0</initializer></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
   </methodsynopsis>
   <para>
    This factory method creates a new hash from a definition in a string. The
@@ -32,6 +33,16 @@
       </para>
      </listitem>
     </varlistentry>
+    <varlistentry>
+     <term><parameter>size</parameter></term>
+     <listitem>
+      <para>
+       The amount of bucket lists to configure. The number you pass in will be
+       automatically rounded up to the next power of two. It is also
+       automatically limited from 4 to 4194304.
+      </para>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term><parameter>options</parameter></term>
      <listitem>
diff --git a/reference/quickhash/quickhashstringinthash/set.xml b/reference/quickhash/quickhashstringinthash/set.xml
index 2ebac90243..e26a89d2a4 100644
--- a/reference/quickhash/quickhashstringinthash/set.xml
+++ b/reference/quickhash/quickhashstringinthash/set.xml
@@ -11,7 +11,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashStringIntHash::set</methodname>
+   <modifier>public</modifier> <type>int</type><methodname>QuickHashStringIntHash::set</methodname>
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
    <methodparam><type>int</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/quickhash/quickhashstringinthash/update.xml b/reference/quickhash/quickhashstringinthash/update.xml
index 27e24f0f65..6836460cc0 100644
--- a/reference/quickhash/quickhashstringinthash/update.xml
+++ b/reference/quickhash/quickhashstringinthash/update.xml
@@ -10,9 +10,9 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>public</modifier> <type>boolean</type><methodname>QuickHashStringIntHash::update</methodname>
+   <modifier>public</modifier> <type>bool</type><methodname>QuickHashStringIntHash::update</methodname>
    <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>integer</type><parameter>value</parameter></methodparam>
+   <methodparam><type>int</type><parameter>value</parameter></methodparam>
   </methodsynopsis>
   <para>
    This method updates an entry with a new value, and returns whether the entry was