Added some more examples, improved messages