Removed debug code
Finalized rage cross-references