fixed some suff