Minor changes to main file