Misc. improvements in targetting graphics