Finish relationship stuff including role labels. Fix a few random bugs.
Cleanup.