Fixed am tools name finding
Target assigning fixed
Fixed messaging