various tweaks to citadel