Fixing likelihood computations
Added Log-likelihood expetation output

Ref #12
Some fixes to the model

Ref #12