Minor changes in main.