tighten up display multiplex
Merge branch 't0int_fix' into bigben