Changed the whole file into a dictionary
Made a few corrections