Made some changes that made Reflow Extraction work on more layouts.
Cleaned up some stuff