Start to rework discussion

Spread out some parts to other places in the paper,
Merged sections as suggested by reviewer 1, cf #15