Extend relationships.
Fix some glitches.