Added more on veggie bacon and fixed merge conflicts.