A little farther along

New scripts + Fixes on older ones