Reflow lines
Update TODO