adjusting names and improvements in getopt.sh