diff --git a/evennia/contrib/README.md b/evennia/contrib/README.md
index 50329bf0eb..a30b7cb64a 100644
--- a/evennia/contrib/README.md
+++ b/evennia/contrib/README.md
@@ -30,8 +30,8 @@ things you want from here into your game folder and change them there.
   multiple descriptions for time and season as well as details.
 * GenderSub (Griatch 2015) - Simple example (only) of storing gender
   on a character and access it in an emote with a custom marker.
-* In-game Python (Vincent Le Geoff 2017) - Allow trusted builders to script
-  objects and events using Python from in-game.
+* Generator (Vincent Le Goff 2017) - Simple pseudo-random generator of
+  strings with rules, avoiding repetitions.
 * Mail (grungies1138 2016) - An in-game mail system for communication.
 * Menu login (Griatch 2011) - A login system using menus asking
   for name/password rather than giving them as one command
@@ -59,6 +59,8 @@ things you want from here into your game folder and change them there.
 
 * EGI_Client (gtaylor 2016) - Client for reporting game status
   to the Evennia game index (games.evennia.com)
+* In-game Python (Vincent Le Goff 2017) - Allow trusted builders to script
+  objects and events using Python from in-game.
 * Tutorial examples (Griatch 2011, 2015) - A folder of basic
   example objects, commands and scripts.
 * Tutorial world (Griatch 2011, 2015) - A folder containing the
diff --git a/evennia/contrib/generator.py b/evennia/contrib/generator.py
index 5bc0395ece..84d6401dcf 100644
--- a/evennia/contrib/generator.py
+++ b/evennia/contrib/generator.py
@@ -1,7 +1,7 @@
 """
 Pseudo-random generator and registry
 
-Evennia contribution - Vincent-lg 2017
+Evennia contribution - Vincent Le Goff 2017
 
 This contrib can be used to generate pseudo-random strings of information
 with specific criteria.  You could, for instance, use it to generate
@@ -14,14 +14,14 @@ Here's a very simple example:
 from evennia.contrib.generator import Generator
 # Create a generator for phone numbers
 phone_generator = Generator("phone number", r"555-\d{3}-\d{4}")
-# Generate a phone number
+# Generate a phone number (555-XXX-XXXX with X as numbers)
 number = phone_generator.generate()
 # `number` will contain something like: "555-981-2207"
 # If you call `phone_generator.generate`, it won't give the same anymore.
 phone_generator.all()
 # Will return a list of all currently-used phone numbers
 phone_generator.free("555-981-2207")
-# The number can be generated again.
+# The number can be generated again
 ```
 
 To use it, you will need to:
@@ -107,8 +107,16 @@ class Generator(object):
     to remove a generated string, or the `clear` method to remove all
     generated strings.
 
+    Bear in mind, however, that while the generated strings will be
+    stored to avoid repetition, the generator will not concern itself
+    with how the string is stored on the object you use.  You probably
+    want to create a tag to mark this object.  This is outside of the scope
+    of this class.
+
     """
 
+    # We keep the script as a class variable to optimize querying
+    # with multiple instandces
     script = None
 
     def __init__(self, name, regex):
@@ -142,7 +150,7 @@ class Generator(object):
 
         # Analyze the regex if any
         if regex:
-            self.find_elements(regex)
+            self._find_elements(regex)
 
     def __repr__(self):
         return "<evennia.contrib.generator.Generator for {}>".format(self.name)
@@ -166,7 +174,7 @@ class Generator(object):
 
         Args:
             store (bool, optional): store the generated string in the script.
-            keep_trying (bool, optional): keep on trying if the string already exists.
+            keep_trying (bool, optional): keep on trying if the string is already used.
 
         Returns:
             The newly-generated string.
@@ -212,7 +220,7 @@ class Generator(object):
 
     def free(self, element):
         """
-        Removes a generated string from the list of stored strings.
+        Remove a generated string from the list of stored strings.
 
         Args:
             element (str): the string to remove from the list of generated strings.
@@ -254,7 +262,7 @@ class Generator(object):
         type(self).script = script
         return script
 
-    def find_elements(self, regex):
+    def _find_elements(self, regex):
         """
         Find the elements described in the regular expression.  This will
         analyze the provided regular expression and try to find elements.