Simplified and fixed current calculations and "interesting" detections.