Highlight fix

this is again for #3.

may not solve the original motivation for turning off highlighting; but globally disabling it seems wrong and was definitely screwing us up.