further doctest-related corrections
More doctest corrections