fix for the non gui extraction
and todos