renamed some models, added comments
renamed annotations
renamed annotations
added add:source goal