Added untarget() and update some names and behaviors.