fix scrollto check
cleanup
working on highlights
fix source file name
highlights (work in progress)