Improved script and options.