Some small reorganisations and typo fixes.