updated command line options handling