A few bugs

I have a hero arena, and Ive come across one or two very strange bugs.

1) My custom spell (based on metamorphisis) works just fine, except for one thing. When the unit dies in his alternate form, he does not revive. The picture of him in the upper left appears to be alive, not darkened. But he cannot be found on the map. He simply disappears.

2) Another move based on metamorph has a problem as well. When the unit shifts back into normal form his portrait is still that of his alternate i.e. you have a Demon Hunter with a huge black demon portrait.

Can anyone help me?

First just answer these:
1)Is this is a custom unit?
2)Is the metamorphosis spell from the regular DH or of Illidan?
3)Was the spell modified in any way?

1 It is a modified unit, not a custom.
2 The meta is from normal DH
3 I do believe that it is not modified, but I cant be certain.