again changed some minor things