Fixed fixed how lines interact with blocks, and partial rollback of real end of file