Note large use of Necromancy was used along with a temp fix with the water trap.
For proper revival later best to never make tombs or slabs for good people. They tend to rez better with no after effects than normal resurrection do.

if anything go wrong I'll post a fix file.