Minor old changes/simplifications
Changed behaviour of confirmation in the case of failure
Merge branch 'improvement/emergency-stop'