Updating examples
Fixed issues