Update the Detectors

(still need to output to file).

Signed-off-by: JP-Ellis <coujellis@gmail.com>