changed some things and stuff