changed some mistakes..