Various changes to the script and style