Cleanup and lots more text.