cd - is not used
Some small fixes
CMD will be overriden by the command specified before save