More updates to fix doctests [WIP]

I'm working through all the doctests that currently fail.