All of the above, please also make it to where the NPC dose not stand at maximum distance when engaging an opponent!