Some updates to improve the examples