Deleted and changed some things