tools now coppied in, batch or recursive make to patch
iran's unstable experiments commented out so this can become master