fixes #352
fixes #177
fixed some imports
fixed bad doctest import; fixes #205
some doc fixes