Some final changes to the script