fixing few things
Merge pull request #99 from alaashafaee/dev_models

fixing few things