- cleaned up /tweaked annotations:  * modified typeUids & corresponding annotations  * modified annotation creation intents to work in a more coherent manner  * added filtering of bad source data  * minor additional tweaks
- cleaned up /tweaked annotations:
 * modified typeUids & corresponding annotations
 * modified annotation creation intents to work in a more coherent manner
 * added filtering of bad source data
 * minor additional tweaks

usco/Jam,usco/Jam