Fixed option and argument parsing.