Remove run-command, new tree output, add label