Changes suggested by Ben
Implement Matt's suggest and improve docstrings