removed getopt functions
resolved merge conflict
resolving more conflicts...