annotate models, misc view changes, etc.