Improvements in Arguments and Console handling handling.
And other minor changes ...