bug fix (npc target choice) and ui modification