Reflow and update the docs a bit