Clean up changes, build changes

...e new changes to the perl scripts.