diff --git a/doc/source/index.rst b/doc/source/index.rst
index cea832a860..41b283e0b6 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -6,7 +6,7 @@ MLOS Documentation
 .. image:: badges/coverage.svg
    :target: htmlcov/index.html
 
-`MLOS <source_tree_docs/index.html>`_ is a project to enable `autotuning </autoapi/mlos_core/index.html>` with `mlos_core </autoapi/mlos_core/index.html>`_ for systems via `automated benchmarking </autoapi/mlos_bench/index.html>`_ with `mlos_bench </autoapi/mlos_bench/index.html>`_ including managing the storage and `visualization </autoapi/mlos_viz/index.html>`_ of the results via `mlos_viz </autoapi/mlos_viz/index.html>`_.
+`MLOS <source_tree_docs/index.html>`_ is a project to enable `autotuning <autoapi/mlos_core/index.html>`_ with `mlos_core <autoapi/mlos_core/index.html>`_ for systems via `automated benchmarking <autoapi/mlos_bench/index.html>`_ with `mlos_bench </autoapi/mlos_bench/index.html>`_ including managing the storage and `visualization <autoapi/mlos_viz/index.html>`_ of the results via `mlos_viz <autoapi/mlos_viz/index.html>`_.
 
 See below for additional documentation sections.
 
diff --git a/mlos_bench/mlos_bench/__init__.py b/mlos_bench/mlos_bench/__init__.py
index 1f54f78c44..455c0139ec 100644
--- a/mlos_bench/mlos_bench/__init__.py
+++ b/mlos_bench/mlos_bench/__init__.py
@@ -21,6 +21,9 @@
 :py:class:`~mlos_bench.optimizers.grid_search_optimizer.GridSearchOptimizer` can be
 used to perform a grid search over the parameter space instead.
 
+TODO: Mention intent and philosophy of the project (repeatable, reproducible, etc.)
+TODO: Mention where to find configs and examples and how to think about them.
+
 The other core classes in this package are:
 
 - :py:mod:`~mlos_bench.environments` which provide abstractions for representing an
diff --git a/mlos_core/mlos_core/__init__.py b/mlos_core/mlos_core/__init__.py
index 8a315cc92a..034dbd712c 100644
--- a/mlos_core/mlos_core/__init__.py
+++ b/mlos_core/mlos_core/__init__.py
@@ -18,6 +18,12 @@
 libraries in order to provide a consistent interface so that the rest of the code
 using it can easily exchange one optimizer for another (or even stack them).
 
+TODO: Mention LlamaTune and space adapters.
+
+TODO: Mention ConfigSpace
+
+TODO: Mention pandas
+
 Specifically:
 
 - :py:class:`~mlos_core.optimizers.optimizer.BaseOptimizer` is the base class for all Optimizers
@@ -56,7 +62,7 @@
 >>> opt = OptimizerFactory.create(
 ...     parameter_space=cs,
 ...     optimization_targets=["y"],
-...     optimizer_type=OptimizerType.SMAC,
+...     optimizer_type=OptimizerType.SMAC,  # or FLAML, etc.
 ...     optimizer_kwargs=opt_args,
 ...     space_adapter_type=SpaceAdapterType.IDENTITY,   # or LLAMATUNE
 ...     space_adapter_kwargs=space_adpaters_kwargs,