Update script and a few minor changes.