added trigger bit combinations, added efficiency corrections