targetting fixes. still not perfect