Fixed highlighting bug (D  // D = bar). Got collection onchange event working.