More examples and bugs fixes