Made some changes and stuff