changes to Main and stuff