Very substantial detection improvement. Test classes need work.