fixes and added some more examples