Improve example for point #3 and various other smaller improvements