improved likelihood calculations