cmd: A few wip logical fixes.