Fix lots of nulls in json response
Minor fixes in ean stuff
Change structure of pantry data stuff