Minor changes in main().