Better command-line handling.
Updated TODO
Fixed connection to child.