Fixed Target class, replaced some old target code in peon