Just some minor changes to the Main