Address comments from Cyril, add some more docs.