Fixes for #40 and #41, plus Extraction UI tweak