More code review fixes, added missing t(), and changed how the facet fail was checked.