Cleanup and adding more content.