Fix a few incoherencies and update doc and comments