Migration and documentation pass

XPATH