Some maintenance on the code and argument parsing