The gun model is now re-ordered and should simply import without problems.
To change its position, well, actually you know more about it than me :P (the rom that is :P) 

anyway, I hope its painless

Trev