more changes to generative model stuff