minor fixes. need to change line tracking.