Hajj before Arafat: invalidity + make-up + sheep + continuing rites.
Hajj after Arafat but before shaving: no invalidity; badanah.
Hajj after shaving: sheep in the stated case.
Umrah before four circuits: invalidity + make-up + sheep + completion.
Umrah after four circuits: no invalidity or make-up; sheep.
This chart summarizes only the specific cases covered by these clauses.