fixed likelihood measurement and other bugs