Some minor fixes in models
Merge pull request #11 from n-zeplo/jeremy_and_jenn

Some minor fixes in models