old code to make id's all excised, just does the autokey now. cleanup highlighting
Merge branch 'upstream/master'