- some fixes in targeting