fix a few things according to foodcritic