Fixed bugs in dish.c. Default tests now all pass.