Clean up wording an other bits and pieces.