More updates to PM and update TreeSpell to use new Targeter