Bug fix
Removed test code
Added print of hilight for line speed
Code cleanup / organization