diff --git a/docs/api.rst b/docs/api.rst
index 533f2d4..022d8e7 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -28,3 +28,11 @@ Cpu
 .. autoclass:: manticore.core.cpu.abstractcpu.Cpu
    :members: read_int, read_bytes, write_int, write_bytes, write_register, read_register, all_registers
 
+Models
+------
+
+.. automodule:: manticore.models
+
+   .. function:: strlen
+
+   .. function:: strcmp
diff --git a/manticore/core/state.py b/manticore/core/state.py
index ae5c3d3..2561145 100644
--- a/manticore/core/state.py
+++ b/manticore/core/state.py
@@ -64,8 +64,8 @@ class State(object):
     Representation of a unique program state/path.
 
     :param ConstraintSet constraints: Initial constraints 
-    :param platform: Initial operating system state
-    :type platform: Decree or Linux or Windows
+    :param Platform platform: Initial operating system state
+    :ivar dict context: Local context for arbitrary data storage
     '''
 
     def __init__(self, constraints, platform):
diff --git a/manticore/manticore.py b/manticore/manticore.py
index 82541cb..438b7b0 100644
--- a/manticore/manticore.py
+++ b/manticore/manticore.py
@@ -140,6 +140,7 @@ class Manticore(object):
     :param str binary_path: Path to binary to analyze
     :param args: Arguments to provide to binary
     :type args: list[str]
+    :ivar dict context: Global context for arbitrary data storage
     '''
 
 
diff --git a/manticore/models.py b/manticore/models.py
index 736efbf..33d495e 100644
--- a/manticore/models.py
+++ b/manticore/models.py
@@ -1,8 +1,13 @@
+"""
+Models here are intended to be passed to :meth:`~manticore.core.state.State.invoke_model`, not invoked directly.
+"""
+
 from .core.cpu.abstractcpu import ConcretizeArgument
 from .utils.helpers import issymbolic
 from .core.smtlib.solver import solver
 from .core.smtlib.operators import ITEBV, ZEXTEND
 
+
 VARIADIC_FUNC_ATTR = '_variadic'
 
 def isvariadic(model):