Bug #8 Bug #9 Fixes

Line highlight delayed.