fixed bugs with number highlighting