Fixed stop command on authenticated nodes

Incorporating other minor, suggested changes.