Fixed examples, and other changes