Bug fix for quotes in column 38 messed up scrolling.
Some cleanup