Fix follow mode. Clean up highlight code.