just some changes

some erros still