Completely agree with both points. The Klingons were altogether great - makeup and hair were perfect, and the captain at the end was the icing on the cake
