Bug Fixes and introduction of Extraction tab