fixed up scrolling and highlighting