Resurrection - Fix for RoF + fixed a couple of memory leaks.