maybe actually finally fixed extraction from messy tables?