Made some changes to some files