Override Updates

Update overrides to reflect new findings and some extrapolations.