shorten and fix some of the examples