Fixed

Some minor changes to fix the script.
Fixed

Some changes on the script.