Fix: Command line arguments, finally done correctly.