Yet another set of tweaks to ResetCommand
Dev: Split the reset routine into two: automatic and manual
Minor fixes