bug fix & option argument change