added some highlighting and scrolling. Some weird behaviour remains