Renamed header to cmd-header when checking commands and changed a rejoin to a join