Trait exportation modifications plus a small doctest fix

Commit messages are a little more descriptive.