Minor changes and script evolution.