fix / change 2, 3, and 4 from http://tpt.io/.265916

mostly makes BRAY act more like PHOT in some cases