small data model changes, fixing some stuff for 2011