Completion: add some comments