3.6/ross dining general fixes