Renamed script, minor improvements.