Editing, trying to make sampling dist / likelihood distinction clearer