fixed some