Some clean up, work needed to get 'References' context menu added and working.