Fixed bugs. Updated command line args.