Comments/revisions for model and controller