fixed smth
some changes