Fixing crosslinks
Updating cross references; merging