more extraction bugs fixed