various improvements to support citadel