Renaming dish -> meal. Additional meal features.