Incremental fixing of examples. Echo and Benchmark in good shape.