More random changes getting ready for script to be usable.