Merge branch 'testing-log-tricks'

merged changes to implement Sam's log tricks (use logitQ instead of Q)