Fix merge conflicts, update comments
Update header comments on models
Merge pull request #31 from cloudspace/67859548_update_model_comments

67859548 update model comments