fixed citadel up to work with added type rules