finally fixed up Multinomial -> Categorical stuff