Fix title and tidy up a few things.