fixed some thangs