fixed some imports and utils rest stuff shit