Minor changes to Main Programs