Add some exercises and cleanup.