Some updates and improved examples and comments