Sneaky extraction module and some fixes