Fix some recursion with highlighting and arrow down + shift for highlighting
Merge remote-tracking branch 'origin/master'