Updated TODO + changed help output