Improving Examples

Bug fix on examples and improving content.