Tried to fix some doc-tests. Left a few for Harold.