Almost finished inference

I hope!
More inference updates, moved E-step updates into their proper place