Made host-shift likelihood calculation and simulation more rigorous