Silly things.
Issue #4: Change commands to form goto-cmd.