Added some stuff in CrossReferencer.java
Mergin' Master Derrick's changes.