Finished entire pass through the paper.

Ping @CedricBastin: please take over the Deferred type errors and evaluation.