changed some mistakes