YAHOO-215 QE-- Little changes after Jonathan Eagles feedback