Updates to Citadel to make it assert later.

Made citadel, if not run, at least not run a little less than it did.