completed TODO for buffer line issues