Tidy up of wip, and presentation.