small changes, need to get the discrete latent vars working...