Finished prewriting marco's important comments. Waiting for more
precision and discussion.
Finished changing minor comments