Examples and some cleanup.