Bug fixes and extra column 'extraction' removed