Added Failure & Threat Targets

Also organized the out put a little better.