diff --git a/doc/guide.rst b/doc/guide.rst
index 88009cdfb90d9e681c3bd8363afb73d036b1732a..e64e8c81c1d394a9eeb897f2570e7d5d62be0d0b 100644
--- a/doc/guide.rst
+++ b/doc/guide.rst
@@ -178,8 +178,8 @@ town. To plot an ROC curve, in possession of your **negatives** and
   >>> # we assume you have your negatives and positives already split
   >>> npoints = 100
   >>> bob.measure.plot.roc(negatives, positives, npoints, color=(0,0,0), linestyle='-', label='test') # doctest: +SKIP
-  >>> pyplot.xlabel('FRR (%)') # doctest: +SKIP
-  >>> pyplot.ylabel('FAR (%)') # doctest: +SKIP
+  >>> pyplot.xlabel('FAR (%)') # doctest: +SKIP
+  >>> pyplot.ylabel('FRR (%)') # doctest: +SKIP
   >>> pyplot.grid(True)
   >>> pyplot.show() # doctest: +SKIP
 
diff --git a/doc/py_api.rst b/doc/py_api.rst
index f9aec07c2fa50c7d8ad7ab47165d03881e9dae6e..125a671eefc870ae77151cf2d393870c55dc981b 100644
--- a/doc/py_api.rst
+++ b/doc/py_api.rst
@@ -9,5 +9,23 @@
 This section includes information for using the pure Python API of ``bob::measure``.
 
 
+Measurement
+-----------
+
 .. automodule:: bob.measure
 
+Loading data
+------------
+
+.. automodule:: bob.measure.load
+
+Calibration
+-----------
+
+.. automodule:: bob.measure.calibration
+
+Plotting
+--------
+
+.. automodule:: bob.measure.plot
+