More improvements to the scripts.