Add debug script
Update TODO
Merge branch 'feature/inc_highlight' into master