more tweaks to Categorical