So you are saying there is a natural character story with all the different characters and that you let Viper die. Now, while you did do that, what happened after does not look like a natural progression, wouldn´t you say?
In fact, the whole story between Envy and Elvira simply looks rushed...