Proposal review

Rewrite more or less some sections.