Yay, everything works fine up until the bit after the tunnel when you find Grant. Another mini-battle with Cerberus is in the works, but I'm going to give him custom code to make him a little more agressive (after all, this isn't the ridiculously easy first fight anymore.)
Before that, however...