Cleanup

Some quick updates for scripts. It'll make it easier when we don't have everything to do.