Made a few changes to Main.java