Add some comments and clarifications