Incorporating Max and Piet's comments.

Incorporating new methods/results.

General re-structuring