initial changeset, models fixes