fixed some thinks