More examples and bug fix