+Naval: Updating fred_consumer and healthmodels