small changes in Main