more comments and Model update