More model changes per discussions with @ghing and @dwillis. #49