more improvements in examples