Johan review

I made lots of commits, so you can easier throw them out or change them.

Many changes are clarifying language, but at some I also changed content slightly. So please review.