diff --git a/pokedex/db/multilang.py b/pokedex/db/multilang.py
index 06a5ab8..b217032 100644
--- a/pokedex/db/multilang.py
+++ b/pokedex/db/multilang.py
@@ -195,6 +195,8 @@ def create_translation_table(_table_name, foreign_class, relation_name,
         # these are passed as *args anyway
         def creator(language, value):
             row = Translations()
+            # TODO this has to be an object; we don't seem to have any way to
+            # handle receiving a string here
             row.local_language = language
             setattr(row, name, value)
             return row
diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 2c14042..b883e82 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -89,10 +89,10 @@ class Language(TableBase):
     id = Column(Integer, primary_key=True, nullable=False,
         doc=u"A numeric ID")
     iso639 = Column(Unicode(79), nullable=False,
-        doc=u"The two-letter code of the country where this language is spoken. Note that it is not unique.",
+        doc=u"The two-letter code of the language. Note that it is not unique.",
         info=dict(format='identifier'))
     iso3166 = Column(Unicode(79), nullable=False,
-        doc=u"The two-letter code of the language. Note that it is not unique.",
+        doc=u"The two-letter code of the country where this language is spoken. Note that it is not unique.",
         info=dict(format='identifier'))
     identifier = Column(Unicode(79), nullable=False,
         doc=u"An identifier",