updates per review

a few more notebook mentions in docstrings,
and inappropriate use of setdefault.