Version 0.4.7 ready.

Includes Sakari's 2nd round of comments + Antti's comments. Off to Tuuli.
Minor chages before Tuuli's comments