Fixes for new model.
Merge pull request #20 from amida-tech/model-fixes

Fixes for new model.