Tweaked two scripts.