Changes to servings schema, forking food position, few other adjustments