Added buggy size comp likelihood components back in (blows up...)