Made some changes to the three main files