Move a few things around.

Try to organise topics so this reads more cohesively.