Changes and fixes.

First major fixes of the day for scripts.