Prior and likelihood changes

Changes in prior and improved likelihood function