Added more examples, bugfix