Minor modifications for checking args.
Commented some debug output in main.