Rewritten the CLI-Parsing

Fixed some parsing problems.