update instructions

New cherry-picks and cleanup.