Add in auto shutdown
Add back in exit code fix