Updated extension detection, more notes from trying to run it in the wild