fixing arguments and options