More changes to examples (made them smarter and added new ones)