Stricter goodie triggers & formatting update