Improved robustness of argument processing.
Removed some old computations and prints.