made more changes
all model tests pass