Fixes and updates to models based on further thought and discussion.