The Joffrey/Criston murder was a stupid change. They should have kept it like the books where he accidentally killed him at the tournament after and had plausible deniability.