Code to allow extra id processing
Cleanup of additional identifier processing
Cleaned up some display templates
Work on editing