close #1, #2
modified example/todo