fixes in the command-system