WIP, inching towards MRF EM
some renames
WIP towards EM with Gibbs sampling