Minor changes in main