Bug fixes.  Added hooks to adding removing cross-table entries.