Fixing up docs and doctest