update model and comments