General clean-up. Lot of margin corrections, comments, some typos.

Exceptions now are raised in the new style. And a mockup class is
now also new style. Thanks Santiago Pereson.