a few additional todo checks, fix bug where no cmd