Added calculate servings. Some fixes.