Firm up coverage, tidy up other bits.