Changing NPC weapons

[HRTGriff]

I'm working on a sp mod that will hopefull involve a lot more jedi fighting. I've been experimenting with the imperial and I have changed it so it moves like a reborn and even holds a lighsaber but it still shoots at me even though it doesn't have a gun.

Also when I use addon models to replace existing NPCs (for example I replaced one of the shadow troopers with the jerec I dloaded) their saber hangs between their legs (wich is amusing at first).

Any ideas on either of these?

Thanks