Improvement and fixes for Example 41.