a few comments, rename script, small adjustment in option handling.