Fixed a todo and added one more example