Reorganize fill_last_lines() slightly
Fix typo