I've updated Kaidan's app, to reflect the fact that his magic actually causes migraines in him, so he basically can't use it other than a barrier. If that doesn't work for you, let me know.

Not a problem about the staff. He has an ordinary bladed staff.

And np about being able to sense other wardens - his app is changed to reflect this.