Tidy-up and add some real content.