More improvements + polish to merge script. Now about 80% complete.